951 files changed, 40887 insertions, 44295 deletions

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/ConsumesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp
index 872a882823f..9710a5fb7ee 100644
--- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.cpp
@@ -21,39 +21,39 @@ TAO_ConsumesDef_i::~TAO_ConsumesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ConsumesDef_i::def_kind (CORBA::Environment &)
+TAO_ConsumesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Consumes;
 }
 
 void 
-TAO_ConsumesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_ConsumesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_ConsumesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ConsumesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ConsumesDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ConsumesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ConsumesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ConsumesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h
index 94383537afd..20c1acf586d 100644
--- a/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ConsumesDef_i.h
@@ -51,36 +51,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.cpp b/TAO/orbsvcs/IFR_Service/Contained_i.cpp
index 1417f706ea3..44414e16b2a 100644
--- a/TAO/orbsvcs/IFR_Service/Contained_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/Contained_i.cpp
@@ -20,16 +20,16 @@ TAO_Contained_i::~TAO_Contained_i (void)
 }
 
 void
-TAO_Contained_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Contained_i::destroy_i (CORBA::Environment &)
+TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -85,16 +85,16 @@ TAO_Contained_i::destroy_i (CORBA::Environment &)
 }
 
 char *
-TAO_Contained_i::id (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::id (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->id_i (ACE_TRY_ENV);
+  return this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::id_i (CORBA::Environment &)
+TAO_Contained_i::id_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -106,19 +106,19 @@ TAO_Contained_i::id_i (CORBA::Environment &)
 }
 
 void
-TAO_Contained_i::id (const char *id,
-                     CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::id (const char *id
+                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->id_i (id,
-              ACE_TRY_ENV);
+  this->id_i (id
+              TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Contained_i::id_i (const char *id,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::id_i (const char *id
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString tmp;
@@ -162,16 +162,16 @@ TAO_Contained_i::id_i (const char *id,
 }
 
 char *
-TAO_Contained_i::name (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::name (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->name_i (ACE_TRY_ENV);
+  return this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::name_i (CORBA::Environment &)
+TAO_Contained_i::name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -183,16 +183,16 @@ TAO_Contained_i::name_i (CORBA::Environment &)
 }
 
 char *
-TAO_Contained_i::version (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::version (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->version_i (ACE_TRY_ENV);
+  return this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::version_i (CORBA::Environment &)
+TAO_Contained_i::version_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString retval;
@@ -204,24 +204,24 @@ TAO_Contained_i::version_i (CORBA::Environment &)
 }
 
 void
-TAO_Contained_i::name (const char *name,
-                       CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::name (const char *name
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->name_i (name,
-                ACE_TRY_ENV);
+  this->name_i (name
+                TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Contained_i::name_i (const char *name,
-                         CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::name_i (const char *name
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Check if name already exists in this container.
-  CORBA::Boolean exists = this->name_exists (name,
-                                             ACE_TRY_ENV);
+  CORBA::Boolean exists = this->name_exists (name
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (exists)
@@ -252,19 +252,19 @@ TAO_Contained_i::name_i (const char *name,
 }
 
 void
-TAO_Contained_i::version (const char *version,
-                          CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::version (const char *version
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->version_i (version,
-                   ACE_TRY_ENV);
+  this->version_i (version
+                   TAO_ENV_ARG_PARAMETER);
 }
 
 void
-TAO_Contained_i::version_i (const char *version,
-                            CORBA::Environment &)
+TAO_Contained_i::version_i (const char *version
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_string_value (this->section_key_,
@@ -273,16 +273,16 @@ TAO_Contained_i::version_i (const char *version,
 }
 
 CORBA_Container_ptr
-TAO_Contained_i::defined_in (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::defined_in (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_Container::_nil ());
 
-  return this->defined_in_i (ACE_TRY_ENV);
+  return this->defined_in_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Container_ptr
-TAO_Contained_i::defined_in_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::defined_in_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
@@ -314,28 +314,28 @@ TAO_Contained_i::defined_in_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    container_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    container_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Container::_nil ());
 
-  CORBA_Container_var retval = CORBA_Container::_narrow (obj.in (),
-                                                         ACE_TRY_ENV);
+  CORBA_Container_var retval = CORBA_Container::_narrow (obj.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Container::_nil ());
 
   return retval._retn ();
 }
 
 char *
-TAO_Contained_i::absolute_name (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::absolute_name (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->absolute_name_i (ACE_TRY_ENV);
+  return this->absolute_name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 char *
-TAO_Contained_i::absolute_name_i (CORBA::Environment &)
+TAO_Contained_i::absolute_name_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString absolute_name;
@@ -347,16 +347,16 @@ TAO_Contained_i::absolute_name_i (CORBA::Environment &)
 }
 
 CORBA_Repository_ptr
-TAO_Contained_i::containing_repository (CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::containing_repository (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_Repository::_nil ());
 
-  return this->containing_repository_i (ACE_TRY_ENV);
+  return this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Repository_ptr
-TAO_Contained_i::containing_repository_i (CORBA::Environment &)
+TAO_Contained_i::containing_repository_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->repo_->repo_objref ();
@@ -365,8 +365,8 @@ TAO_Contained_i::containing_repository_i (CORBA::Environment &)
 void
 TAO_Contained_i::move (CORBA_Container_ptr new_container,
                        const char *new_name,
-                       const char *new_version,
-                       CORBA::Environment &ACE_TRY_ENV)
+                       const char *new_version
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
@@ -374,13 +374,13 @@ TAO_Contained_i::move (CORBA_Container_ptr new_container,
   this->move_i (new_container,
                 new_name,
                 new_version,
-                1,
-                ACE_TRY_ENV);
+                1
+                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Contained_i::name_exists (const char *name,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::name_exists (const char *name
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString container_id;
@@ -390,8 +390,8 @@ TAO_Contained_i::name_exists (const char *name,
 
   if (container_id == "")
     {
-      return this->repo_->name_exists (name,
-                                       ACE_TRY_ENV);
+      return this->repo_->name_exists (name
+                                       TAO_ENV_ARG_PARAMETER);
     }
 
   ACE_TString container_path;
@@ -484,16 +484,16 @@ void
 TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                          const char *new_name,
                          const char *new_version,
-                         CORBA::Boolean cleanup,
-                         CORBA::Environment &ACE_TRY_ENV)
+                         CORBA::Boolean cleanup
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Repository_var my_repo =
-    this->containing_repository_i (ACE_TRY_ENV);
+    this->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::DefinitionKind container_dk =
-    new_container->def_kind (ACE_TRY_ENV);
+    new_container->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_Configuration_Section_Key container_key;
@@ -515,8 +515,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
   else
     {
       PortableServer::ObjectId_var oid =
-        this->repo_->ir_poa ()->reference_to_id (new_container,
-                                                 ACE_TRY_ENV);
+        this->repo_->ir_poa ()->reference_to_id (new_container
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var container_path =
@@ -527,15 +527,15 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                            container_key,
                                            0);
 
-      TAO_Contained_i *impl = 
-        this->repo_->servant_factory ()->create_contained (container_key,
-                                                           ACE_TRY_ENV);
+      TAO_Contained_i *impl =
+        this->repo_->servant_factory ()->create_contained (container_key
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       auto_ptr<TAO_Contained_i> safety (impl);
 
       CORBA_Repository_var your_repo =
-        impl->containing_repository_i (ACE_TRY_ENV);
+        impl->containing_repository_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       if (my_repo.in () != your_repo.in ())
@@ -543,16 +543,16 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           ACE_THROW (CORBA::BAD_PARAM (4, CORBA::COMPLETED_NO));
         }
 
-      container_impl = 
-        this->repo_->servant_factory ()->create_container (container_key,
-                                                           ACE_TRY_ENV);
+      container_impl =
+        this->repo_->servant_factory ()->create_container (container_key
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
-  CORBA::DefinitionKind my_dk = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind my_dk = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::String_var id = this->id_i (ACE_TRY_ENV);
+  CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // If an exception is thrown, this must be restored.
@@ -576,7 +576,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_EnumDef_i impl (this->repo_,
                               this->section_key_);
 
-          CORBA_EnumMemberSeq_var members = impl.members_i (ACE_TRY_ENV);
+          CORBA_EnumMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Struct
@@ -585,8 +585,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name,
-                                      ACE_TRY_ENV);
+                                      new_name
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -594,8 +594,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             container_impl->create_enum_i (id.in (),
                                            new_name,
                                            new_version,
-                                           members.in (),
-                                           ACE_TRY_ENV);
+                                           members.in ()
+                                           TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -604,14 +604,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_AliasDef_i impl (this->repo_,
                                this->section_key_);
 
-          CORBA_IDLType_var otype = impl.original_type_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           container_impl->create_alias_i (id.in (),
                                           new_name,
                                           new_version,
-                                          otype.in (),
-                                          ACE_TRY_ENV);
+                                          otype.in ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -619,8 +619,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
         {
           container_impl->create_native_i (id.in (),
                                            new_name,
-                                           new_version,
-                                           ACE_TRY_ENV);
+                                           new_version
+                                           TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -629,14 +629,14 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_ValueBoxDef_i impl (this->repo_,
                                   this->section_key_);
 
-          CORBA_IDLType_var otype = impl.original_type_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var otype = impl.original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           container_impl->create_value_box_i (id.in (),
                                               new_name,
                                               new_version,
-                                              otype.in (),
-                                              ACE_TRY_ENV);
+                                              otype.in ()
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -645,7 +645,7 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_StructDef_i impl (this->repo_,
                                 this->section_key_);
 
-          CORBA_StructMemberSeq_var members = impl.members_i (ACE_TRY_ENV);
+          CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Struct
@@ -654,8 +654,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name,
-                                      ACE_TRY_ENV);
+                                      new_name
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -663,12 +663,12 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             container_impl->create_struct_i (id.in (),
                                              new_name,
                                              new_version,
-                                             members.in (),
-                                             ACE_TRY_ENV);
+                                             members.in ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -678,10 +678,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                this->section_key_);
 
           CORBA_IDLType_var disc_type =
-            impl.discriminator_type_def_i (ACE_TRY_ENV);
+            impl.discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_UnionMemberSeq_var members = impl.members_i (ACE_TRY_ENV);
+          CORBA_UnionMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Struct
@@ -690,8 +690,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
             {
               this->move_pre_process (new_container,
                                       my_path.c_str (),
-                                      new_name,
-                                      ACE_TRY_ENV);
+                                      new_name
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -700,12 +700,12 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                             new_name,
                                             new_version,
                                             disc_type.in (),
-                                            members.in (),
-                                            ACE_TRY_ENV);
+                                            members.in ()
+                                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -714,12 +714,12 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           CORBA_ModuleDef_var new_defn =
             container_impl->create_module_i (id.in (),
                                              new_name,
-                                             new_version,
-                                             ACE_TRY_ENV);
+                                             new_version
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -728,19 +728,19 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_ExceptionDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_StructMemberSeq_var members = impl.members_i (ACE_TRY_ENV);
+          CORBA_StructMemberSeq_var members = impl.members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_ExceptionDef_var new_defn =
             container_impl->create_exception_i (id.in (),
                                                 new_name,
                                                 new_version,
-                                                members.in (),
-                                                ACE_TRY_ENV);
+                                                members.in ()
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -749,20 +749,20 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_InterfaceDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_InterfaceDefSeq_var bases = 
-            impl.base_interfaces_i (ACE_TRY_ENV);
+          CORBA_InterfaceDefSeq_var bases =
+            impl.base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_InterfaceDef_var new_defn =
             container_impl->create_interface_i (id.in (),
                                                 new_name,
                                                 new_version,
-                                                bases.in (),
-                                                ACE_TRY_ENV);
+                                                bases.in ()
+                                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          this->move_contents (new_defn.in (),
-                               ACE_TRY_ENV);
+          this->move_contents (new_defn.in ()
+                               TAO_ENV_ARG_PARAMETER);
 
           break;
         }
@@ -771,18 +771,18 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_ConstantDef_i impl (this->repo_,
                                   this->section_key_);
 
-          CORBA_IDLType_var type_def = impl.type_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::Any_var value = impl.value_i (ACE_TRY_ENV);
+          CORBA::Any_var value = impl.value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           container_impl->create_constant_i (id.in (),
                                              new_name,
                                              new_version,
                                              type_def.in (),
-                                             value.in (),
-                                             ACE_TRY_ENV);
+                                             value.in ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
           break;
         }
@@ -791,10 +791,10 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_AttributeDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_IDLType_var type_def = impl.type_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var type_def = impl.type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::AttributeMode mode = impl.mode_i (ACE_TRY_ENV);
+          CORBA::AttributeMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Interface)
@@ -806,8 +806,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        new_name,
                                        new_version,
                                        type_def.in (),
-                                       mode,
-                                       ACE_TRY_ENV);
+                                       mode
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -820,8 +820,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        new_name,
                                        new_version,
                                        type_def.in (),
-                                       mode,
-                                       ACE_TRY_ENV);
+                                       mode
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -835,20 +835,20 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
           TAO_OperationDef_i impl (this->repo_,
                                    this->section_key_);
 
-          CORBA_IDLType_var result = impl.result_def_i (ACE_TRY_ENV);
+          CORBA_IDLType_var result = impl.result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA::OperationMode mode = impl.mode_i (ACE_TRY_ENV);
+          CORBA::OperationMode mode = impl.mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_ParDescriptionSeq_var params = impl.params_i (ACE_TRY_ENV);
+          CORBA_ParDescriptionSeq_var params = impl.params_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_ExceptionDefSeq_var exceptions = 
-            impl.exceptions_i (ACE_TRY_ENV);
+          CORBA_ExceptionDefSeq_var exceptions =
+            impl.exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          CORBA_ContextIdSeq_var contexts = impl.contexts_i (ACE_TRY_ENV);
+          CORBA_ContextIdSeq_var contexts = impl.contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (container_dk == CORBA::dk_Interface)
@@ -863,8 +863,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        mode,
                                        params.in (),
                                        exceptions.in (),
-                                       contexts.in (),
-                                       ACE_TRY_ENV);
+                                       contexts.in ()
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -880,8 +880,8 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
                                        mode,
                                        params.in (),
                                        exceptions.in (),
-                                       contexts.in (),
-                                       ACE_TRY_ENV);
+                                       contexts.in ()
+                                       TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
             }
@@ -966,13 +966,13 @@ TAO_Contained_i::move_i (CORBA_Container_ptr new_container,
 void
 TAO_Contained_i::move_pre_process (CORBA_Container_ptr container,
                                    const char *contained_path,
-                                   const char *name,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const char *name
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var container_oid =
-    this->repo_->ir_poa ()->reference_to_id (container,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (container
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var container_path =
@@ -1026,8 +1026,8 @@ TAO_Contained_i::move_pre_process (CORBA_Container_ptr container,
 }
 
 void
-TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
-                                CORBA::Environment &ACE_TRY_ENV)
+TAO_Contained_i::move_contents (CORBA_Container_ptr new_container
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -1069,8 +1069,8 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
 
               TAO_Contained_i *impl =
                 this->repo_->servant_factory ()->create_contained (
-                                                     defn_key,
-                                                     ACE_TRY_ENV
+                                                     defn_key
+                                                     TAO_ENV_ARG_PARAMETER
                                                    );
               ACE_CHECK;
 
@@ -1079,14 +1079,14 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
               impl->move_i (new_container,
                             name.c_str (),
                             version.c_str (),
-                            0,
-                            ACE_TRY_ENV);
+                            0
+                            TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
     }
 
-  CORBA::DefinitionKind kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // Specific to InterfaceDef_i and ValueDef_i
@@ -1130,8 +1130,8 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
               impl.move_i (new_container,
                            name.c_str (),
                            version.c_str (),
-                           0,
-                           ACE_TRY_ENV);
+                           0
+                           TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
@@ -1173,8 +1173,8 @@ TAO_Contained_i::move_contents (CORBA_Container_ptr new_container,
               impl.move_i (new_container,
                            name.c_str (),
                            version.c_str (),
-                           0,
-                           ACE_TRY_ENV);
+                           0
+                           TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
diff --git a/TAO/orbsvcs/IFR_Service/Contained_i.h b/TAO/orbsvcs/IFR_Service/Contained_i.h
index 5b1422c0bc9..299288402e9 100644
--- a/TAO/orbsvcs/IFR_Service/Contained_i.h
+++ b/TAO/orbsvcs/IFR_Service/Contained_i.h
@@ -51,153 +51,130 @@ public:
   // Destructor.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *id_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void id (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void id_i (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *name_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void name (
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void name_i (
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *version_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void version (
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void version_i (
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Container_ptr defined_in_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char *absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   char *absolute_name_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Repository_ptr containing_repository_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void move (
       CORBA_Container_ptr new_container,
       const char *new_name,
-      const char *new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
@@ -205,10 +182,9 @@ protected:
       CORBA_Container_ptr new_container,
       const char *new_name,
       const char *new_version,
-      CORBA::Boolean cleanup,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean cleanup
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Engine for move() with an extra 'cleanup'
   // parameter. Since a section removal can be
@@ -217,10 +193,9 @@ protected:
 
 private:
   CORBA::Boolean name_exists (
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Check if <name> already exists in our container
 
@@ -233,10 +208,9 @@ private:
   void move_pre_process (
       CORBA_Container_ptr container,
       const char *contained_path,
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Mangle the names of references that are also
   // defined in the scope, so a name clash will
@@ -244,10 +218,9 @@ private:
   // unmangles the names.
 
   void move_contents (
-      CORBA_Container_ptr new_container,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_Container_ptr new_container
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Recursively calls move_i for definitions,
   // as well as operations and attributes if
diff --git a/TAO/orbsvcs/IFR_Service/Container_i.cpp b/TAO/orbsvcs/IFR_Service/Container_i.cpp
index 9e7c6fd25e2..c3bbfcc8e0f 100644
--- a/TAO/orbsvcs/IFR_Service/Container_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/Container_i.cpp
@@ -21,16 +21,16 @@ TAO_Container_i::~TAO_Container_i (void)
 }
 
 void
-TAO_Container_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int index = 0;
@@ -39,12 +39,12 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
 
   // Destroy and/or remove references.
 
-	ACE_Configuration_Section_Key refs_key;
-	status =
-		this->repo_->config ()->open_section (this->section_key_,
-																					"refs",
-																					0,
-																					refs_key);
+        ACE_Configuration_Section_Key refs_key;
+        status =
+                this->repo_->config ()->open_section (this->section_key_,
+                                                                                                                                                                        "refs",
+                                                                                                                                                                        0,
+                                                                                                                                                                        refs_key);
 
   // This section may not have been created.
   if (status == 0)
@@ -76,13 +76,13 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
           if (status == 0)
             {
               TAO_IDLType_i *impl =
-                this->repo_->servant_factory ()->create_idltype (entry_key,
-                                                                 ACE_TRY_ENV);
+                this->repo_->servant_factory ()->create_idltype (entry_key
+                                                                 TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
 
               auto_ptr<TAO_IDLType_i> safety (impl);
 
-              CORBA::DefinitionKind def_kind = impl->def_kind (ACE_TRY_ENV);
+              CORBA::DefinitionKind def_kind = impl->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_CHECK;
 
               switch (def_kind)
@@ -95,7 +95,7 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
                 case CORBA::dk_Fixed:
                 case CORBA::dk_Array:
                 case CORBA::dk_Sequence:
-                  impl->destroy_i (ACE_TRY_ENV);
+                  impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_CHECK;
                   break;
                 default:
@@ -145,13 +145,13 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
                                                 defn_key);
 
           TAO_Contained_i *impl =
-            this->repo_->servant_factory ()->create_contained (defn_key,
-                                                               ACE_TRY_ENV);
+            this->repo_->servant_factory ()->create_contained (defn_key
+                                                               TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           auto_ptr<TAO_Contained_i> safety (impl);
 
-          impl->destroy_i (ACE_TRY_ENV);
+          impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -162,19 +162,19 @@ TAO_Container_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
 }
 
 CORBA_Contained_ptr
-TAO_Container_i::lookup (const char *search_name,
-                         CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::lookup (const char *search_name
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->lookup_i (search_name,
-                         ACE_TRY_ENV);
+  return this->lookup_i (search_name
+                         TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Contained_ptr
-TAO_Container_i::lookup_i (const char *search_name,
-                           CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::lookup_i (const char *search_name
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key iter_key;
@@ -377,31 +377,31 @@ TAO_Container_i::lookup_i (const char *search_name,
 
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Contained::_nil ());
 
-  return CORBA_Contained::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_Contained::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ContainedSeq *
 TAO_Container_i::contents (CORBA::DefinitionKind limit_type,
-                           CORBA::Boolean exclude_inherited,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Boolean exclude_inherited
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->contents_i (limit_type,
-                           exclude_inherited,
-                           ACE_TRY_ENV);
+                           exclude_inherited
+                           TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ContainedSeq *
 TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
-                             CORBA::Boolean exclude_inherited,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA::Boolean exclude_inherited
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (limit_type == CORBA::dk_none)
@@ -467,7 +467,7 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
 
   // Base interfaces
 
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (def_kind == CORBA::dk_Interface)
@@ -482,8 +482,8 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
           iface.interface_contents (kind_queue,
                                     path_queue,
                                     limit_type,
-                                    exclude_inherited,
-                                    ACE_TRY_ENV);
+                                    exclude_inherited
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (0);
         }
     }
@@ -510,13 +510,13 @@ TAO_Container_i::contents_i (CORBA::DefinitionKind limit_type,
 
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (next_kind,
-                                                        next_path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        next_path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA_Contained_var next_cont =
-        CORBA_Contained::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+        CORBA_Contained::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[j] = next_cont._retn ();
@@ -529,8 +529,8 @@ CORBA_ContainedSeq *
 TAO_Container_i::lookup_name (const char *search_name,
                               CORBA::Long levels_to_search,
                               CORBA::DefinitionKind limit_type,
-                              CORBA::Boolean exclude_inherited,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              CORBA::Boolean exclude_inherited
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
@@ -538,16 +538,16 @@ TAO_Container_i::lookup_name (const char *search_name,
   return this->lookup_name_i (search_name,
                               levels_to_search,
                               limit_type,
-                              exclude_inherited,
-                              ACE_TRY_ENV);
+                              exclude_inherited
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ContainedSeq *
 TAO_Container_i::lookup_name_i (const char *search_name,
                                 CORBA::Long levels_to_search,
                                 CORBA::DefinitionKind limit_type,
-                                CORBA::Boolean exclude_inherited,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Boolean exclude_inherited
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -558,8 +558,8 @@ TAO_Container_i::lookup_name_i (const char *search_name,
                                search_name,
                                levels_to_search,
                                limit_type,
-                               exclude_inherited,
-                               ACE_TRY_ENV);
+                               exclude_inherited
+                               TAO_ENV_ARG_PARAMETER);
 
   size_t size = kind_queue.size ();
 
@@ -582,13 +582,13 @@ TAO_Container_i::lookup_name_i (const char *search_name,
 
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (next_kind,
-                                                        next_path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        next_path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       CORBA_Contained_var next_cont =
-        CORBA_Contained::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+        CORBA_Contained::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i] = next_cont._retn ();
@@ -600,28 +600,28 @@ TAO_Container_i::lookup_name_i (const char *search_name,
 CORBA_Container::DescriptionSeq *
 TAO_Container_i::describe_contents (CORBA::DefinitionKind limit_type,
                                     CORBA::Boolean exclude_inherited,
-                                    CORBA::Long max_returned_objs,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    CORBA::Long max_returned_objs
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
   return this->describe_contents_i (limit_type,
                                     exclude_inherited,
-                                    max_returned_objs,
-                                    ACE_TRY_ENV);
+                                    max_returned_objs
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Container::DescriptionSeq *
 TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
                                       CORBA::Boolean exclude_inherited,
-                                      CORBA::Long max_returned_objs,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      CORBA::Long max_returned_objs
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_ContainedSeq_var contents = this->contents_i (limit_type,
-                                                      exclude_inherited,
-                                                      ACE_TRY_ENV);
+                                                      exclude_inherited
+                                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = contents->length ();
@@ -653,8 +653,8 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
 
   for (CORBA::ULong i = 0; i < ret_len; i++)
     {
-      oid = this->repo_->ir_poa ()->reference_to_id (contents[i],
-                                                     ACE_TRY_ENV);
+      oid = this->repo_->ir_poa ()->reference_to_id (contents[i]
+                                                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       contained_path =
@@ -665,14 +665,14 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
                                            contained_key,
                                            0);
 
-      impl = 
-        this->repo_->servant_factory ()->create_contained (contained_key,
-                                                           ACE_TRY_ENV);
+      impl =
+        this->repo_->servant_factory ()->create_contained (contained_key
+                                                           TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_Contained_i> safety (impl);
 
-      desc = impl->describe_i (ACE_TRY_ENV);
+      desc = impl->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       retval[i].contained_object =
@@ -689,35 +689,35 @@ TAO_Container_i::describe_contents_i (CORBA::DefinitionKind limit_type,
 CORBA_ModuleDef_ptr
 TAO_Container_i::create_module (const char *id,
                                 const char *name,
-                                const char *version,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                const char *version
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ModuleDef::_nil ());
 
   return this->create_module_i (id,
                                 name,
-                                version,
-                                ACE_TRY_ENV);
+                                version
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ModuleDef_ptr
 TAO_Container_i::create_module_i (const char *id,
                                   const char *name,
-                                  const char *version,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const char *version
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Module
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
 
   if (!legal_op)
     return CORBA_ModuleDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
 
   if (bad_params)
@@ -751,12 +751,12 @@ TAO_Container_i::create_module_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Module,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ModuleDef::_nil ());
 
-  return CORBA_ModuleDef::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_ModuleDef::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstantDef_ptr
@@ -764,8 +764,8 @@ TAO_Container_i::create_constant (const char *id,
                                   const char *name,
                                   const char *version,
                                   CORBA_IDLType_ptr type,
-                                  const CORBA::Any &value,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const CORBA::Any &value
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ConstantDef::_nil ());
@@ -774,8 +774,8 @@ TAO_Container_i::create_constant (const char *id,
                                   name,
                                   version,
                                   type,
-                                  value,
-                                  ACE_TRY_ENV);
+                                  value
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ConstantDef_ptr
@@ -783,20 +783,20 @@ TAO_Container_i::create_constant_i (const char *id,
                                     const char *name,
                                     const char *version,
                                     CORBA_IDLType_ptr type,
-                                    const CORBA::Any &value,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const CORBA::Any &value
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Constant
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   if (!legal_op)
     return CORBA_ConstantDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   if (bad_params)
@@ -822,8 +822,8 @@ TAO_Container_i::create_constant_i (const char *id,
 
   // Get the path to our type and store it.
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (type,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (type
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   CORBA::String_var type_path =
@@ -838,7 +838,7 @@ TAO_Container_i::create_constant_i (const char *id,
 
   CORBA::TypeCode_var val_tc = value.type ();
 
-  CORBA::TCKind kind = val_tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = val_tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
   switch (kind)
@@ -868,20 +868,20 @@ TAO_Container_i::create_constant_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Constant,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ConstantDef::_nil ());
 
-  return CORBA_ConstantDef::_narrow (obj.in (),
-                                     ACE_TRY_ENV);
+  return CORBA_ConstantDef::_narrow (obj.in ()
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructDef_ptr
 TAO_Container_i::create_struct (const char *id,
                                 const char *name,
                                 const char *version,
-                                const CORBA_StructMemberSeq &members,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                const CORBA_StructMemberSeq &members
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_StructDef::_nil ());
@@ -889,28 +889,28 @@ TAO_Container_i::create_struct (const char *id,
   return this->create_struct_i (id,
                                 name,
                                 version,
-                                members,
-                                ACE_TRY_ENV);
+                                members
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructDef_ptr
 TAO_Container_i::create_struct_i (const char *id,
                                   const char *name,
                                   const char *version,
-                                  const CORBA_StructMemberSeq &members,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const CORBA_StructMemberSeq &members
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Struct
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   if (!legal_op)
     return CORBA_StructDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   if (bad_params)
@@ -962,8 +962,8 @@ TAO_Container_i::create_struct_i (const char *id,
                                                 members[i].name.in ());
 
       PortableServer::ObjectId_var oid =
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
       CORBA::String_var member_path =
@@ -974,7 +974,7 @@ TAO_Container_i::create_struct_i (const char *id,
                                                 member_path.in ());
     }
 
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
   if (def_kind == CORBA::dk_Struct
@@ -988,12 +988,12 @@ TAO_Container_i::create_struct_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Struct,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StructDef::_nil ());
 
-  return CORBA_StructDef::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_StructDef::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_UnionDef_ptr
@@ -1001,8 +1001,8 @@ TAO_Container_i::create_union (const char *id,
                                const char *name,
                                const char *version,
                                CORBA_IDLType_ptr discriminator_type,
-                               const CORBA_UnionMemberSeq &members,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const CORBA_UnionMemberSeq &members
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_UnionDef::_nil ());
@@ -1011,8 +1011,8 @@ TAO_Container_i::create_union (const char *id,
                                name,
                                version,
                                discriminator_type,
-                               members,
-                               ACE_TRY_ENV);
+                               members
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_UnionDef_ptr
@@ -1020,20 +1020,20 @@ TAO_Container_i::create_union_i (const char *id,
                                  const char *name,
                                  const char *version,
                                  CORBA_IDLType_ptr discriminator_type,
-                                 const CORBA_UnionMemberSeq &members,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 const CORBA_UnionMemberSeq &members
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Union
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   if (!legal_op)
     return CORBA_UnionDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   if (bad_params)
@@ -1058,8 +1058,8 @@ TAO_Container_i::create_union_i (const char *id,
 
   // Add a field to hold the path to the discriminator type.
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (discriminator_type,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (discriminator_type
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   CORBA::String_var disc_path =
@@ -1098,8 +1098,8 @@ TAO_Container_i::create_union_i (const char *id,
                                                 members[i].name.in ());
 
       PortableServer::ObjectId_var oid =
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
       CORBA::String_var member_path =
@@ -1110,11 +1110,11 @@ TAO_Container_i::create_union_i (const char *id,
                                                 member_path.in ());
 
       this->store_label (member_key,
-                         members[i].label,
-                         ACE_TRY_ENV);
+                         members[i].label
+                         TAO_ENV_ARG_PARAMETER);
     }
 
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
   if (def_kind == CORBA::dk_Struct
@@ -1128,20 +1128,20 @@ TAO_Container_i::create_union_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Union,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_UnionDef::_nil ());
 
-  return CORBA_UnionDef::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+  return CORBA_UnionDef::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumDef_ptr
 TAO_Container_i::create_enum (const char *id,
                               const char *name,
                               const char *version,
-                              const CORBA_EnumMemberSeq &members,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              const CORBA_EnumMemberSeq &members
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_EnumDef::_nil ());
@@ -1149,28 +1149,28 @@ TAO_Container_i::create_enum (const char *id,
   return this->create_enum_i (id,
                               name,
                               version,
-                              members,
-                              ACE_TRY_ENV);
+                              members
+                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumDef_ptr
 TAO_Container_i::create_enum_i (const char *id,
                                 const char *name,
                                 const char *version,
-                                const CORBA_EnumMemberSeq &members,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                const CORBA_EnumMemberSeq &members
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Enum
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   if (!legal_op)
     return CORBA_EnumDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   if (bad_params)
@@ -1215,7 +1215,7 @@ TAO_Container_i::create_enum_i (const char *id,
                                                 members[i].in ());
     }
 
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
   if (def_kind == CORBA::dk_Struct
@@ -1229,20 +1229,20 @@ TAO_Container_i::create_enum_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Enum,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_EnumDef::_nil ());
 
-  return CORBA_EnumDef::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_EnumDef::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AliasDef_ptr
 TAO_Container_i::create_alias (const char *id,
                                const char *name,
                                const char *version,
-                               CORBA_IDLType_ptr original_type,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               CORBA_IDLType_ptr original_type
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_AliasDef::_nil ());
@@ -1250,28 +1250,28 @@ TAO_Container_i::create_alias (const char *id,
   return this->create_alias_i (id,
                                name,
                                version,
-                               original_type,
-                               ACE_TRY_ENV);
+                               original_type
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AliasDef_ptr
 TAO_Container_i::create_alias_i (const char *id,
                                  const char *name,
                                  const char *version,
-                                 CORBA_IDLType_ptr original_type,
-                                 CORBA::Environment &ACE_TRY_ENV)
+                                 CORBA_IDLType_ptr original_type
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Alias
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   if (!legal_op)
     return CORBA_AliasDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   if (bad_params)
@@ -1296,8 +1296,8 @@ TAO_Container_i::create_alias_i (const char *id,
 
   // Get the path to our original type and store it.
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (original_type,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (original_type
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
   CORBA::String_var unalias_path =
@@ -1310,20 +1310,20 @@ TAO_Container_i::create_alias_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Alias,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AliasDef::_nil ());
 
-  return CORBA_AliasDef::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+  return CORBA_AliasDef::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr
 TAO_Container_i::create_interface (const char *id,
                                    const char *name,
                                    const char *version,
-                                   const CORBA_InterfaceDefSeq &base_interfaces,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const CORBA_InterfaceDefSeq &base_interfaces
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
@@ -1331,28 +1331,28 @@ TAO_Container_i::create_interface (const char *id,
   return this->create_interface_i (id,
                                    name,
                                    version,
-                                   base_interfaces,
-                                   ACE_TRY_ENV);
+                                   base_interfaces
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr
 TAO_Container_i::create_interface_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     const CORBA_InterfaceDefSeq &base_interfaces,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     const CORBA_InterfaceDefSeq &base_interfaces
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Interface
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (!legal_op)
     return CORBA_InterfaceDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
   if (bad_params)
@@ -1391,8 +1391,8 @@ TAO_Container_i::create_interface_i (const char *id,
       for (CORBA::ULong i = 0; i < length; i++)
         {
           PortableServer::ObjectId_var oid =
-            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i],
-                                                     ACE_TRY_ENV);
+            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
           CORBA::String_var inherited_path =
@@ -1409,12 +1409,12 @@ TAO_Container_i::create_interface_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Interface,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_InterfaceDef::_nil ());
 
-  return CORBA_InterfaceDef::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+  return CORBA_InterfaceDef::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr
@@ -1427,8 +1427,8 @@ TAO_Container_i::create_value (const char *id,
                                CORBA::Boolean is_truncatable,
                                const CORBA_ValueDefSeq &abstract_base_values,
                                const CORBA_InterfaceDefSeq &supported_interfaces,
-                               const CORBA_InitializerSeq &initializers,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const CORBA_InitializerSeq &initializers
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueDef::_nil ());
@@ -1442,8 +1442,8 @@ TAO_Container_i::create_value (const char *id,
                                is_truncatable,
                                abstract_base_values,
                                supported_interfaces,
-                               initializers,
-                               ACE_TRY_ENV);
+                               initializers
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueDef_ptr
@@ -1456,8 +1456,8 @@ TAO_Container_i::create_value_i (const char * /* id */,
                                  CORBA::Boolean /* is_truncatable */,
                                  const CORBA_ValueDefSeq & /* abstract_base_values */,
                                  const CORBA_InterfaceDefSeq & /* supported_interfaces */,
-                                 const CORBA_InitializerSeq & /* initializers */,
-                                 CORBA::Environment & /* ACE_TRY_ENV */)
+                                 const CORBA_InitializerSeq & /* initializers */
+                                 TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -1468,8 +1468,8 @@ CORBA_ValueBoxDef_ptr
 TAO_Container_i::create_value_box (const char *id,
                                    const char *name,
                                    const char *version,
-                                   CORBA_IDLType_ptr original_type_def,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA_IDLType_ptr original_type_def
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueBoxDef::_nil ());
@@ -1477,28 +1477,28 @@ TAO_Container_i::create_value_box (const char *id,
   return this->create_value_box_i (id,
                                    name,
                                    version,
-                                   original_type_def,
-                                   ACE_TRY_ENV);
+                                   original_type_def
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ValueBoxDef_ptr
 TAO_Container_i::create_value_box_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     CORBA_IDLType_ptr original_type_def,
-                                     CORBA::Environment &ACE_TRY_ENV )
+                                     CORBA_IDLType_ptr original_type_def
+                                     TAO_ENV_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_ValueBox
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   if (!legal_op)
     return CORBA_ValueBoxDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   if (bad_params)
@@ -1523,8 +1523,8 @@ TAO_Container_i::create_value_box_i (const char *id,
 
   // Get the path to our original type and store it.
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (original_type_def,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (original_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
   CORBA::String_var boxed_path =
@@ -1537,20 +1537,20 @@ TAO_Container_i::create_value_box_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_ValueBox,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ValueBoxDef::_nil ());
 
-  return CORBA_ValueBoxDef::_narrow (obj.in (),
-                                     ACE_TRY_ENV);
+  return CORBA_ValueBoxDef::_narrow (obj.in ()
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDef_ptr
 TAO_Container_i::create_exception (const char *id,
                                    const char *name,
                                    const char *version,
-                                   const CORBA_StructMemberSeq &members,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   const CORBA_StructMemberSeq &members
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ExceptionDef::_nil ());
@@ -1558,28 +1558,28 @@ TAO_Container_i::create_exception (const char *id,
   return this->create_exception_i (id,
                                    name,
                                    version,
-                                   members,
-                                   ACE_TRY_ENV);
+                                   members
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDef_ptr
 TAO_Container_i::create_exception_i (const char *id,
                                      const char *name,
                                      const char *version,
-                                     const CORBA_StructMemberSeq &members,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     const CORBA_StructMemberSeq &members
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Exception
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
   if (!legal_op)
     return CORBA_ExceptionDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
   if (bad_params)
@@ -1629,8 +1629,8 @@ TAO_Container_i::create_exception_i (const char *id,
                                                 members[i].name.in ());
 
       PortableServer::ObjectId_var oid =
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
       CORBA::String_var member_path =
@@ -1644,46 +1644,46 @@ TAO_Container_i::create_exception_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Exception,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ExceptionDef::_nil ());
 
-  return CORBA_ExceptionDef::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+  return CORBA_ExceptionDef::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_NativeDef_ptr
 TAO_Container_i::create_native (const char *id,
                                 const char *name,
-                                const char *version,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                const char *version
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_NativeDef::_nil ());
 
   return this->create_native_i (id,
                                 name,
-                                version,
-                                ACE_TRY_ENV);
+                                version
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_NativeDef_ptr
 TAO_Container_i::create_native_i (const char *id,
                                   const char *name,
-                                  const char *version,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  const char *version
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_Native
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
 
   if (!legal_op)
     return CORBA_NativeDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
 
   if (bad_params)
@@ -1709,12 +1709,12 @@ TAO_Container_i::create_native_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Native,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_NativeDef::_nil ());
 
-  return CORBA_NativeDef::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_NativeDef::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AbstractInterfaceDef_ptr
@@ -1722,8 +1722,8 @@ TAO_Container_i::create_abstract_interface (
     const char *id,
     const char *name,
     const char *version,
-    const CORBA_AbstractInterfaceDefSeq &base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq &base_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1732,8 +1732,8 @@ TAO_Container_i::create_abstract_interface (
   return this->create_abstract_interface_i (id,
                                             name,
                                             version,
-                                            base_interfaces,
-                                            ACE_TRY_ENV);
+                                            base_interfaces
+                                            TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_AbstractInterfaceDef_ptr
@@ -1741,14 +1741,14 @@ TAO_Container_i::create_abstract_interface_i (
     const char *id,
     const char *name,
     const char *version,
-    const CORBA_AbstractInterfaceDefSeq &base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq &base_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::Boolean legal_op = this->valid_container (
-      CORBA::dk_AbstractInterface,
-      ACE_TRY_ENV
+      CORBA::dk_AbstractInterface
+      TAO_ENV_ARG_PARAMETER
     );
   ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
@@ -1756,8 +1756,8 @@ TAO_Container_i::create_abstract_interface_i (
     return CORBA_AbstractInterfaceDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
   if (bad_params)
@@ -1796,8 +1796,8 @@ TAO_Container_i::create_abstract_interface_i (
       for (CORBA::ULong i = 0; i < length; i++)
         {
           PortableServer::ObjectId_var oid =
-            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i],
-                                                     ACE_TRY_ENV);
+            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
           CORBA::String_var inherited_path =
@@ -1814,12 +1814,12 @@ TAO_Container_i::create_abstract_interface_i (
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_AbstractInterface,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AbstractInterfaceDef::_nil ());
 
-  return CORBA_AbstractInterfaceDef::_narrow (obj.in (),
-                                              ACE_TRY_ENV);
+  return CORBA_AbstractInterfaceDef::_narrow (obj.in ()
+                                              TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_LocalInterfaceDef_ptr
@@ -1827,8 +1827,8 @@ TAO_Container_i::create_local_interface (
     const char *id,
     const char *name,
     const char *version,
-    const CORBA_InterfaceDefSeq &base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq &base_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1837,8 +1837,8 @@ TAO_Container_i::create_local_interface (
   return this->create_local_interface_i (id,
                                          name,
                                          version,
-                                         base_interfaces,
-                                         ACE_TRY_ENV);
+                                         base_interfaces
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_LocalInterfaceDef_ptr
@@ -1846,21 +1846,21 @@ TAO_Container_i::create_local_interface_i (
     const char *id,
     const char *name,
     const char *version,
-    const CORBA_InterfaceDefSeq &base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq &base_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface,
-                                                   ACE_TRY_ENV);
+  CORBA::Boolean legal_op = this->valid_container (CORBA::dk_LocalInterface
+                                                   TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
   if (!legal_op)
     return CORBA_LocalInterfaceDef::_nil ();
 
   CORBA::Boolean bad_params = this->pre_exist (id,
-                                               name,
-                                               ACE_TRY_ENV);
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
   if (bad_params)
@@ -1899,8 +1899,8 @@ TAO_Container_i::create_local_interface_i (
       for (CORBA::ULong i = 0; i < length; i++)
         {
           PortableServer::ObjectId_var oid =
-            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i],
-                                                     ACE_TRY_ENV);
+            this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
           CORBA::String_var inherited_path =
@@ -1917,17 +1917,17 @@ TAO_Container_i::create_local_interface_i (
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_LocalInterface,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_LocalInterfaceDef::_nil ());
 
-  return CORBA_LocalInterfaceDef::_narrow (obj.in (),
-                                           ACE_TRY_ENV);
+  return CORBA_LocalInterfaceDef::_narrow (obj.in ()
+                                           TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::Boolean
-TAO_Container_i::name_exists (const char *name,
-                              CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::name_exists (const char *name
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int index = 0;
@@ -2003,7 +2003,7 @@ TAO_Container_i::name_exists (const char *name,
     }
 
   // If we are an interface, check the inherited members.
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (def_kind == CORBA::dk_Interface)
@@ -2059,8 +2059,8 @@ TAO_Container_i::lookup_name_recursive (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL
     )
 {
   ACE_Configuration_Section_Key defns_key;
@@ -2124,8 +2124,8 @@ TAO_Container_i::lookup_name_recursive (
             {
               TAO_Container_i *impl =
                 this->repo_->servant_factory ()->create_container (
-                                                     defn_key,
-                                                     ACE_TRY_ENV
+                                                     defn_key
+                                                     TAO_ENV_ARG_PARAMETER
                                                    );
               ACE_CHECK;
 
@@ -2142,14 +2142,14 @@ TAO_Container_i::lookup_name_recursive (
                                               ? -1
                                               : levels_to_search - 1,
                                            limit_type,
-                                           exclude_inherited,
-                                           ACE_TRY_ENV);
+                                           exclude_inherited
+                                           TAO_ENV_ARG_PARAMETER);
               ACE_CHECK;
             }
         }
     }
 
-  CORBA::DefinitionKind kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (kind == CORBA::dk_Interface || kind == CORBA::dk_Value)
@@ -2377,8 +2377,8 @@ TAO_Container_i::lookup_op (
 }
 
 CORBA::Boolean
-TAO_Container_i::id_exists (const char *id,
-                            CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::id_exists (const char *id
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // The repo id must not already exist.
@@ -2399,17 +2399,17 @@ TAO_Container_i::id_exists (const char *id,
 
 CORBA::Boolean
 TAO_Container_i::pre_exist (const char *id,
-                            const char *name,
-                            CORBA::Environment &ACE_TRY_ENV)
+                            const char *name
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean exist = this->id_exists (id, ACE_TRY_ENV);
+  CORBA::Boolean exist = this->id_exists (id TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (1);
 
   if (exist)
     return 1;
 
-  return name_exists (name, ACE_TRY_ENV);
+  return name_exists (name TAO_ENV_ARG_PARAMETER);
 }
 
 ACE_TString
@@ -2515,11 +2515,11 @@ TAO_Container_i::create_common (
 }
 
 CORBA::Boolean
-TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::DefinitionKind my_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind my_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   int error_flag = 0;
@@ -2578,13 +2578,13 @@ TAO_Container_i::valid_container (const CORBA::DefinitionKind op_kind,
 
 void
 TAO_Container_i::store_label (ACE_Configuration_Section_Key key,
-                              const CORBA::Any &value,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              const CORBA::Any &value
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var tc = value.type ();
 
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   TAO_InputCDR cdr (value._tao_get_cdr (),
diff --git a/TAO/orbsvcs/IFR_Service/Container_i.h b/TAO/orbsvcs/IFR_Service/Container_i.h
index a23a0fb3526..df454997d72 100644
--- a/TAO/orbsvcs/IFR_Service/Container_i.h
+++ b/TAO/orbsvcs/IFR_Service/Container_i.h
@@ -42,7 +42,7 @@ class TAO_Container_i : public virtual TAO_IRObject_i
   //
   // = DESCRIPTION
   //    Abstract base class used to form a containment hierarchy
-  //    in the Interface Repository, by containing objects 
+  //    in the Interface Repository, by containing objects
   //    derived from the Contained interface.
   //
 public:
@@ -54,102 +54,90 @@ public:
   // Destructor.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove our contents.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained_ptr lookup (
-      const char *search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Contained_ptr lookup_i (
-      const char *search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ContainedSeq *contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ContainedSeq *contents_i (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ContainedSeq *lookup_name (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ContainedSeq *lookup_name_i (
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Container::DescriptionSeq *describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Container::DescriptionSeq *describe_contents_i (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ModuleDef_ptr create_module (
       const char *id,
       const char *name,
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ModuleDef_ptr create_module_i (
       const char *id,
       const char *name,
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ConstantDef_ptr create_constant (
@@ -157,10 +145,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ConstantDef_ptr create_constant_i (
@@ -168,30 +155,27 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_StructDef_ptr create_struct (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StructDef_ptr create_struct_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_UnionDef_ptr create_union (
@@ -199,10 +183,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_UnionDef_ptr create_union_i (
@@ -210,70 +193,63 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_EnumDef_ptr create_enum (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_EnumMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_EnumDef_ptr create_enum_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_EnumMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_AliasDef_ptr create_alias (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AliasDef_ptr create_alias_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_InterfaceDef_ptr create_interface (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef_ptr create_interface_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr create_value (
@@ -286,10 +262,9 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq &abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq &initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq &initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr create_value_i (
@@ -302,134 +277,120 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq &abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq &initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq &initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueBoxDef_ptr create_value_box (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueBoxDef_ptr create_value_box_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ExceptionDef_ptr create_exception (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ExceptionDef_ptr create_exception_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_NativeDef_ptr create_native (
       const char *id,
       const char *name,
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_NativeDef_ptr create_native_i (
       const char *id,
       const char *name,
-      const char *version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_AbstractInterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AbstractInterfaceDef_ptr create_abstract_interface_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_AbstractInterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_LocalInterfaceDef_ptr create_local_interface_i (
       const char *id,
       const char *name,
       const char *version,
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean name_exists (
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Checks for local existence of <name>.
-                  
+
 protected:
    void store_label (
       ACE_Configuration_Section_Key key,
-      const CORBA::Any &value,                           
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any &value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Store a union member's label value.
 
   CORBA::Boolean pre_exist (
       const char *id,
-      const char *name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Bundles id_exists and name_exists together.
 
@@ -465,24 +426,21 @@ private:
       const char *search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   CORBA::Boolean id_exists (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Checks for global existence of the repo id.
 
   CORBA::Boolean valid_container (
-      const CORBA::DefinitionKind op_kind,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::DefinitionKind op_kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Is this operation valid for this container type?
 
diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp
index bdcd681fa01..eac6599262e 100644
--- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.cpp
@@ -19,39 +19,39 @@ TAO_EmitsDef_i::~TAO_EmitsDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EmitsDef_i::def_kind (CORBA::Environment &)
+TAO_EmitsDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Emits;
 }
 
 void 
-TAO_EmitsDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_EmitsDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_EmitsDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_EmitsDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_EmitsDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_EmitsDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_EmitsDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_EmitsDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h
index e58f8327ffc..4759d541ab8 100644
--- a/TAO/orbsvcs/IFR_Service/EmitsDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/EmitsDef_i.h
@@ -51,36 +51,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp
index 901c4f331fe..04ab433cb5b 100644
--- a/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.cpp
@@ -21,23 +21,23 @@ TAO_EnumDef_i::~TAO_EnumDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_EnumDef_i::def_kind (CORBA::Environment &)
+TAO_EnumDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Enum;
 }
 
-CORBA::TypeCode_ptr 
-TAO_EnumDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_EnumDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_EnumDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_EnumDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -50,26 +50,26 @@ TAO_EnumDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             "name",
                                             name);
 
-  CORBA_EnumMemberSeq_var members = this->members_i (ACE_TRY_ENV);
+  CORBA_EnumMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_enum_tc (id.c_str (),
                                                      name.c_str (),
-                                                     members.in (),
-                                                     ACE_TRY_ENV);
+                                                     members.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_EnumMemberSeq *
-TAO_EnumDef_i::members (CORBA::Environment &ACE_TRY_ENV)
+TAO_EnumDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (ACE_TRY_ENV);
+  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_EnumMemberSeq *
-TAO_EnumDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_EnumDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -105,20 +105,20 @@ TAO_EnumDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
   return retval;
 }
 
-void 
-TAO_EnumDef_i::members (const CORBA_EnumMemberSeq &members,
-                        CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_EnumDef_i::members (const CORBA_EnumMemberSeq &members
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->members_i (members,
-                   ACE_TRY_ENV);
+  this->members_i (members
+                   TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_EnumDef_i::members_i (const CORBA_EnumMemberSeq &members,
-                          CORBA::Environment &)
+void
+TAO_EnumDef_i::members_i (const CORBA_EnumMemberSeq &members
+                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
diff --git a/TAO/orbsvcs/IFR_Service/EnumDef_i.h b/TAO/orbsvcs/IFR_Service/EnumDef_i.h
index 1ff7447416c..ba0aefb5c6f 100644
--- a/TAO/orbsvcs/IFR_Service/EnumDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/EnumDef_i.h
@@ -51,50 +51,43 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_EnumMemberSeq *members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_EnumMemberSeq *members_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA_EnumMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA_EnumMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp
index 3e270a16914..b7e4549e081 100644
--- a/TAO/orbsvcs/IFR_Service/EventDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/EventDef_i.cpp
@@ -17,70 +17,70 @@ TAO_EventDef_i::~TAO_EventDef_i (void)
 {
 }
 
-void 
-TAO_EventDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_EventDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_EventDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_EventDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_EventDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_EventDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_EventDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_EventDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::Boolean 
-TAO_EventDef_i::is_a (const char *event_id,
-                      CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_EventDef_i::is_a (const char *event_id
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (event_id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (event_id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_EventDef_i::is_a_i (const char * /* event_id */,
-                        CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_EventDef_i::is_a_i (const char * /* event_id */
+                        TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_ValueDef_ptr 
-TAO_EventDef_i::event (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ValueDef_ptr
+TAO_EventDef_i::event (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ());
 
-  return this->event_i (ACE_TRY_ENV);
+  return this->event_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_ValueDef_ptr 
-TAO_EventDef_i::event_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA_ValueDef_ptr
+TAO_EventDef_i::event_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/EventDef_i.h b/TAO/orbsvcs/IFR_Service/EventDef_i.h
index 091f5fb5afe..e86186fc725 100644
--- a/TAO/orbsvcs/IFR_Service/EventDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/EventDef_i.h
@@ -51,56 +51,48 @@ public:
   // Destructor
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Boolean is_a (
-      const char *event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *event_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *event_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *event_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr event (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr event_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp
index cb6db156611..3bffdcc71d6 100644
--- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.cpp
@@ -24,45 +24,45 @@ TAO_ExceptionDef_i::~TAO_ExceptionDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ExceptionDef_i::def_kind (CORBA::Environment &)
+TAO_ExceptionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Exception;
 }
 
-void 
-TAO_ExceptionDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ExceptionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ExceptionDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ExceptionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-    
+
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA_Contained::Description *
-TAO_ExceptionDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ExceptionDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ExceptionDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -73,15 +73,15 @@ TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_ExceptionDescription ed;
 
-  ed.name = this->name_i (ACE_TRY_ENV);
+  ed.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ed.id = this->id_i (ACE_TRY_ENV);
+  ed.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -92,10 +92,10 @@ TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   ed.defined_in = container_id.c_str ();
 
-  ed.version = this->version_i (ACE_TRY_ENV);
+  ed.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ed.type = this->type_i (ACE_TRY_ENV);
+  ed.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   retval->value <<= ed;
@@ -103,17 +103,17 @@ TAO_ExceptionDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
   return retval._retn ();
 }
 
-CORBA::TypeCode_ptr 
-TAO_ExceptionDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ExceptionDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ExceptionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ExceptionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -126,26 +126,26 @@ TAO_ExceptionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             "name",
                                             name);
 
-  CORBA_StructMemberSeq_var members = this->members_i (ACE_TRY_ENV);
+  CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_exception_tc (id.c_str (),
                                                           name.c_str (),
-                                                          members.in (),
-                                                          ACE_TRY_ENV);
+                                                          members.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_ExceptionDef_i::members (CORBA::Environment &ACE_TRY_ENV)
+TAO_ExceptionDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (ACE_TRY_ENV);
+  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ExceptionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -201,7 +201,7 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
                                                      "def_kind",
                                                      kind);
 
-          CORBA::DefinitionKind def_kind = 
+          CORBA::DefinitionKind def_kind =
             ACE_static_cast (CORBA::DefinitionKind, kind);
 
           kind_queue.enqueue_tail (def_kind);
@@ -209,7 +209,7 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
     }
 
   size_t size = kind_queue.size ();
-                    
+
   CORBA_StructMemberSeq *members = 0;
   ACE_NEW_THROW_EX (members,
                     CORBA_StructMemberSeq (size),
@@ -237,14 +237,14 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
 
       path_queue.dequeue_head (path);
 
-      obj = 
+      obj =
         this->repo_->servant_factory ()->create_objref (kind,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-    
-      retval[k].type_def = CORBA_IDLType::_narrow (obj.in (),
-                                                   ACE_TRY_ENV);
+
+      retval[k].type_def = CORBA_IDLType::_narrow (obj.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
@@ -253,37 +253,37 @@ TAO_ExceptionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
                                            0);
 
       impl =
-        this->repo_->servant_factory ()->create_idltype (member_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (member_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
-    
-      retval[k].type = impl->type_i (ACE_TRY_ENV);
+
+      retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members,
-                             CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ExceptionDef_i::members (const CORBA_StructMemberSeq &members
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->members_i (members,
-                   ACE_TRY_ENV);
+  this->members_i (members
+                   TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members,
-                               CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count = members.length ();
@@ -315,9 +315,9 @@ TAO_ExceptionDef_i::members_i (const CORBA_StructMemberSeq &members,
                                                     "name",
                                                     name);
 
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           CORBA::String_var path =
diff --git a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h
index bade27d5c42..0a1d55cad82 100644
--- a/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ExceptionDef_i.h
@@ -34,7 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_ExceptionDef_i : public virtual TAO_Contained_i, 
+class TAO_ExceptionDef_i : public virtual TAO_Contained_i,
                            public virtual TAO_Container_i
 {
   // = TITLE
@@ -52,76 +52,65 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_StructMemberSeq *members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StructMemberSeq *members_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp
index 9f967d089eb..597ad4f0235 100644
--- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.cpp
@@ -21,39 +21,39 @@ TAO_FactoryDef_i::~TAO_FactoryDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FactoryDef_i::def_kind (CORBA::Environment &)
+TAO_FactoryDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Factory;
 }
 
 void 
-TAO_FactoryDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_FactoryDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_FactoryDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_FactoryDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_FactoryDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_FactoryDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_FactoryDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */ )
+TAO_FactoryDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h
index 12cdb254fbc..09718358b0c 100644
--- a/TAO/orbsvcs/IFR_Service/FactoryDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/FactoryDef_i.h
@@ -50,36 +50,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp
index 88e363a16f5..a8a16e4178b 100644
--- a/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.cpp
@@ -19,39 +19,39 @@ TAO_FinderDef_i::~TAO_FinderDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FinderDef_i::def_kind (CORBA::Environment &)
+TAO_FinderDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Finder;
 }
 
 void 
-TAO_FinderDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_FinderDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_FinderDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_FinderDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_FinderDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_FinderDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_FinderDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */ )
+TAO_FinderDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/FinderDef_i.h b/TAO/orbsvcs/IFR_Service/FinderDef_i.h
index 34b1cc78c93..ea9d60edcfa 100644
--- a/TAO/orbsvcs/IFR_Service/FinderDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/FinderDef_i.h
@@ -50,36 +50,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp
index af5b9736b21..42ccaf54ec2 100644
--- a/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.cpp
@@ -18,112 +18,112 @@ TAO_FixedDef_i::~TAO_FixedDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_FixedDef_i::def_kind (CORBA::Environment &)
+TAO_FixedDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Fixed;
 }
 
-void 
-TAO_FixedDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_FixedDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_FixedDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_FixedDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::TypeCode_ptr 
-TAO_FixedDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_FixedDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_FixedDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::TypeCode_ptr
+TAO_FixedDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::UShort 
-TAO_FixedDef_i::digits (CORBA::Environment &ACE_TRY_ENV)
+CORBA::UShort
+TAO_FixedDef_i::digits (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->digits_i (ACE_TRY_ENV);
+  return this->digits_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::UShort 
-TAO_FixedDef_i::digits_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::UShort
+TAO_FixedDef_i::digits_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_FixedDef_i::digits (CORBA::UShort digits,
-                        CORBA::Environment & ACE_TRY_ENV)
+void
+TAO_FixedDef_i::digits (CORBA::UShort digits
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->digits_i (digits,
-                  ACE_TRY_ENV);
+  this->digits_i (digits
+                  TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */,
-                          CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_FixedDef_i::digits_i (CORBA::UShort /* digits */
+                          TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Short 
-TAO_FixedDef_i::scale (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Short
+TAO_FixedDef_i::scale (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->scale_i (ACE_TRY_ENV);
+  return this->scale_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Short 
-TAO_FixedDef_i::scale_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Short
+TAO_FixedDef_i::scale_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_FixedDef_i::scale (CORBA::Short scale,
-                       CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_FixedDef_i::scale (CORBA::Short scale
+                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->scale_i (scale,
-                 ACE_TRY_ENV);
+  this->scale_i (scale
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_FixedDef_i::scale_i (CORBA::Short /* scale */,
-                       CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_FixedDef_i::scale_i (CORBA::Short /* scale */
+                       TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/FixedDef_i.h b/TAO/orbsvcs/IFR_Service/FixedDef_i.h
index 4f2537801eb..6ea79f0cc0b 100644
--- a/TAO/orbsvcs/IFR_Service/FixedDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/FixedDef_i.h
@@ -50,89 +50,76 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::UShort digits (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::UShort digits_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void digits (
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void digits_i (
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Short scale (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Short scale_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void scale (
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void scale_i (
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp
index fb6cd59071a..77617ed7ab9 100644
--- a/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.cpp
@@ -21,107 +21,107 @@ TAO_HomeDef_i::~TAO_HomeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_HomeDef_i::def_kind (CORBA::Environment &)
+TAO_HomeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Home;
 }
 
-void 
-TAO_HomeDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_HomeDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_HomeDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_HomeDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_HomeDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_HomeDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_HomeDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_HomeDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::TypeCode_ptr 
-TAO_HomeDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_HomeDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_HomeDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::TypeCode_ptr
+TAO_HomeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::HomeDef_ptr 
-TAO_HomeDef_i::base_home (CORBA::Environment &ACE_TRY_ENV)
+IR::HomeDef_ptr
+TAO_HomeDef_i::base_home (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::HomeDef::_nil ());
 
-  return this->base_home_i (ACE_TRY_ENV);
+  return this->base_home_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-IR::HomeDef_ptr 
-TAO_HomeDef_i::base_home_i (CORBA::Environment & /* ACE_TRY_ENV */)
+IR::HomeDef_ptr
+TAO_HomeDef_i::base_home_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::ComponentDef_ptr 
-TAO_HomeDef_i::managed_component (CORBA::Environment &ACE_TRY_ENV)
+IR::ComponentDef_ptr
+TAO_HomeDef_i::managed_component (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::ComponentDef::_nil ());
 
-  return this->managed_component_i (ACE_TRY_ENV);
+  return this->managed_component_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-IR::ComponentDef_ptr 
-TAO_HomeDef_i::managed_component_i (CORBA::Environment & /* ACE_TRY_ENV */)
+IR::ComponentDef_ptr
+TAO_HomeDef_i::managed_component_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::PrimaryKeyDef_ptr 
-TAO_HomeDef_i::primary_key (CORBA::Environment &ACE_TRY_ENV)
+IR::PrimaryKeyDef_ptr
+TAO_HomeDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (IR::PrimaryKeyDef::_nil ());
 
-  return this->primary_key_i (ACE_TRY_ENV);
+  return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-IR::PrimaryKeyDef_ptr 
-TAO_HomeDef_i::primary_key_i (CORBA::Environment & /* ACE_TRY_ENV */)
+IR::PrimaryKeyDef_ptr
+TAO_HomeDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -129,16 +129,16 @@ TAO_HomeDef_i::primary_key_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 IR::FactoryDefSeq *
-TAO_HomeDef_i::factories (CORBA::Environment &ACE_TRY_ENV)
+TAO_HomeDef_i::factories (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->factories_i (ACE_TRY_ENV);
+  return this->factories_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::FactoryDefSeq *
-TAO_HomeDef_i::factories_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_HomeDef_i::factories_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -146,45 +146,45 @@ TAO_HomeDef_i::factories_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 IR::FinderDefSeq *
-TAO_HomeDef_i::finders (CORBA::Environment &ACE_TRY_ENV)
+TAO_HomeDef_i::finders (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->finders_i (ACE_TRY_ENV);
+  return this->finders_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 IR::FinderDefSeq *
-TAO_HomeDef_i::finders_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_HomeDef_i::finders_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::Boolean 
-TAO_HomeDef_i::is_basic (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_HomeDef_i::is_basic (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_basic_i (ACE_TRY_ENV);
+  return this->is_basic_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_HomeDef_i::is_basic_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_HomeDef_i::is_basic_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::PrimaryKeyDef_ptr 
+IR::PrimaryKeyDef_ptr
 TAO_HomeDef_i::create_primary_key (const char *id,
                                    const char *name,
                                    const char *version,
-                                   CORBA_ValueDef_ptr primary_key,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA_ValueDef_ptr primary_key
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::PrimaryKeyDef::_nil ());
@@ -192,29 +192,29 @@ TAO_HomeDef_i::create_primary_key (const char *id,
   return this->create_primary_key_i (id,
                                      name,
                                      version,
-                                     primary_key,
-                                     ACE_TRY_ENV);
+                                     primary_key
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
-IR::PrimaryKeyDef_ptr 
+IR::PrimaryKeyDef_ptr
 TAO_HomeDef_i::create_primary_key_i (const char * /* id */,
                                      const char * /* name */,
                                      const char * /* version */,
-                                     CORBA_ValueDef_ptr /* primary_key */,
-                                     CORBA::Environment & /* ACE_TRY_ENV */)
+                                     CORBA_ValueDef_ptr /* primary_key */
+                                     TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-IR::FactoryDef_ptr 
+IR::FactoryDef_ptr
 TAO_HomeDef_i::create_factory (const char *id,
                                const char *name,
                                const char *version,
                                const CORBA_ParDescriptionSeq &params,
-                               const CORBA_ExceptionDefSeq &exceptions,
-                               CORBA::Environment &ACE_TRY_ENV)
+                               const CORBA_ExceptionDefSeq &exceptions
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::FactoryDef::_nil ());
@@ -223,18 +223,18 @@ TAO_HomeDef_i::create_factory (const char *id,
                                  name,
                                  version,
                                  params,
-                                 exceptions,
-                                 ACE_TRY_ENV);
+                                 exceptions
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-IR::FactoryDef_ptr 
+IR::FactoryDef_ptr
 TAO_HomeDef_i::create_factory_i (
     const char * /* id */,
     const char * /* name */,
     const char * /* version */,
     const CORBA_ParDescriptionSeq & /* params */,
-    const CORBA_ExceptionDefSeq & /* exceptions */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_ExceptionDefSeq & /* exceptions */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -242,13 +242,13 @@ TAO_HomeDef_i::create_factory_i (
   return 0;
 }
 
-IR::FinderDef_ptr 
+IR::FinderDef_ptr
 TAO_HomeDef_i::create_finder (const char *id,
                               const char *name,
                               const char *version,
                               const CORBA_ParDescriptionSeq &params,
-                              const CORBA_ExceptionDefSeq &exceptions,
-                              CORBA::Environment &ACE_TRY_ENV)
+                              const CORBA_ExceptionDefSeq &exceptions
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (IR::FinderDef::_nil ());
@@ -257,18 +257,18 @@ TAO_HomeDef_i::create_finder (const char *id,
                                 name,
                                 version,
                                 params,
-                                exceptions,
-                                ACE_TRY_ENV);
+                                exceptions
+                                TAO_ENV_ARG_PARAMETER);
 }
 
-IR::FinderDef_ptr 
+IR::FinderDef_ptr
 TAO_HomeDef_i::create_finder_i (
     const char * /* id */,
     const char * /* name */,
     const char * /* version */,
     const CORBA_ParDescriptionSeq & /* params */,
-    const CORBA_ExceptionDefSeq & /* exceptions */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_ExceptionDefSeq & /* exceptions */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/IFR_Service/HomeDef_i.h b/TAO/orbsvcs/IFR_Service/HomeDef_i.h
index ad2f96d4b10..473bf92c399 100644
--- a/TAO/orbsvcs/IFR_Service/HomeDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/HomeDef_i.h
@@ -49,146 +49,125 @@ public:
   // Constructor
 
   virtual ~TAO_HomeDef_i (void);
-  // Destructor  
+  // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual IR::HomeDef_ptr base_home (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::HomeDef_ptr base_home_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::ComponentDef_ptr managed_component (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::ComponentDef_ptr managed_component_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::PrimaryKeyDef_ptr primary_key (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::PrimaryKeyDef_ptr primary_key_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FactoryDefSeq *factories (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FactoryDefSeq *factories_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FinderDefSeq *finders (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FinderDefSeq *finders_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_basic (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_basic_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::PrimaryKeyDef_ptr create_primary_key (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr primary_key
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::PrimaryKeyDef_ptr create_primary_key_i (
       const char *id,
       const char *name,
       const char *version,
-      CORBA_ValueDef_ptr primary_key,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr primary_key
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FactoryDef_ptr create_factory (
@@ -196,10 +175,9 @@ public:
       const char *name,
       const char *version,
       const CORBA_ParDescriptionSeq &params,
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FactoryDef_ptr create_factory_i (
@@ -207,10 +185,9 @@ public:
       const char *name,
       const char *version,
       const CORBA_ParDescriptionSeq &params,
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual IR::FinderDef_ptr create_finder (
@@ -218,10 +195,9 @@ public:
       const char *name,
       const char *version,
       const CORBA_ParDescriptionSeq &params,
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   IR::FinderDef_ptr create_finder_i (
@@ -229,10 +205,9 @@ public:
       const char *name,
       const char *version,
       const CORBA_ParDescriptionSeq &params,
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/IDLType_i.h b/TAO/orbsvcs/IFR_Service/IDLType_i.h
index 521fdcef356..3090d1cf163 100644
--- a/TAO/orbsvcs/IFR_Service/IDLType_i.h
+++ b/TAO/orbsvcs/IFR_Service/IDLType_i.h
@@ -54,16 +54,14 @@ public:
   // Destructor.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Defined in concrete classes.
 };
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
index 7e55a1c3994..571fa45f9c4 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.cpp
@@ -162,36 +162,32 @@ public:
   TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::DefinitionKind result);
@@ -208,45 +204,45 @@ private:
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_IRObject *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_IRObject *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -258,7 +254,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -267,11 +263,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -287,36 +283,32 @@ public:
   TAO_ServerRequestInfo_CORBA_IRObject_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IRObject *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -332,45 +324,45 @@ private:
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::TAO_ServerRequestInfo_CORBA_IRObject_destroy (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_IRObject *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_IRObject *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_destroy::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_destroy::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -378,7 +370,7 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -387,11 +379,11 @@ TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_IRObject_destroy::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -423,18 +415,18 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::~_TAO_CORBA_IRObject_Strategized_P
 
 _TAO_CORBA_IRObject_Proxy_Impl&
 _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_IRObject *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_IRObject *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -443,8 +435,8 @@ _TAO_CORBA_IRObject_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_IRObject_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -513,8 +505,8 @@ _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -529,8 +521,8 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "def_kind",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -539,13 +531,13 @@ CORBA::DefinitionKind _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::def_kind (
           "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->def_kind (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -558,8 +550,8 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "destroy",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -568,7 +560,7 @@ void _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl::destroy (
           "IDL:omg.org/CORBA/IRObject:1.0"
         )
     )->destroy (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
   return;
 }
@@ -596,8 +588,8 @@ POA_CORBA_IRObject::~POA_CORBA_IRObject (void)
 void POA_CORBA_IRObject::_get_def_kind_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl =
@@ -617,19 +609,19 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
   TAO_ServerRequestInfo_CORBA_IRObject_def_kind_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->def_kind (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -637,20 +629,20 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
       CORBA::DefinitionKind _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -672,16 +664,13 @@ void POA_CORBA_IRObject::_get_def_kind_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_IRObject::destroy_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl =
@@ -701,38 +690,38 @@ void POA_CORBA_IRObject::destroy_skel (
   TAO_ServerRequestInfo_CORBA_IRObject_destroy ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->destroy (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -747,16 +736,13 @@ void POA_CORBA_IRObject::destroy_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_IRObject::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -766,7 +752,7 @@ void POA_CORBA_IRObject::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -778,12 +764,12 @@ void POA_CORBA_IRObject::_is_a_skel (
 void POA_CORBA_IRObject::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -795,8 +781,8 @@ void POA_CORBA_IRObject::_non_existent_skel (
 void POA_CORBA_IRObject::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject *_tao_impl = (POA_CORBA_IRObject *) _tao_object_reference;
@@ -815,7 +801,7 @@ void POA_CORBA_IRObject::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -841,11 +827,11 @@ void POA_CORBA_IRObject::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_IRObject::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -867,12 +853,12 @@ void* POA_CORBA_IRObject::_downcast (
   return 0;
 }
 
-void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_IRObject::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -882,9 +868,9 @@ const char* POA_CORBA_IRObject::_interface_repository_id (void) const
 }
 
 CORBA_IRObject*
-POA_CORBA_IRObject::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_IRObject::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1049,36 +1035,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_id_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1095,45 +1077,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_id_get::TAO_ServerRequestInfo_CORBA_Contained_id_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_id_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1145,7 +1127,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1154,11 +1136,11 @@ TAO_ServerRequestInfo_CORBA_Contained_id_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_id_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1175,36 +1157,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
     ,
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1222,8 +1200,8 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl,
-    const char * id,
-    CORBA::Environment &
+    const char * id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1231,12 +1209,12 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::TAO_ServerRequestInfo_CORBA_Contai
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1252,25 +1230,25 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::arguments (CORBA::Environment &ACE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_id_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_id_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1278,7 +1256,7 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1287,11 +1265,11 @@ TAO_ServerRequestInfo_CORBA_Contained_id_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_id_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_Contained_name_get : public TAO_ServerRequestInfo
@@ -1300,36 +1278,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_name_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1346,45 +1320,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_name_get::TAO_ServerRequestInfo_CORBA_Contained_name_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_name_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1396,7 +1370,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1405,11 +1379,11 @@ TAO_ServerRequestInfo_CORBA_Contained_name_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_name_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1426,36 +1400,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
     ,
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * name
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1473,8 +1443,8 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl,
-    const char * name,
-    CORBA::Environment &
+    const char * name
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1482,12 +1452,12 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::TAO_ServerRequestInfo_CORBA_Cont
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1503,25 +1473,25 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_name_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_name_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1529,7 +1499,7 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1538,11 +1508,11 @@ TAO_ServerRequestInfo_CORBA_Contained_name_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_name_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_Contained_version_get : public TAO_ServerRequestInfo
@@ -1551,36 +1521,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_version_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1597,45 +1563,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_version_get::TAO_ServerRequestInfo_CORBA_Contained_version_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_version_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1647,7 +1613,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1656,11 +1622,11 @@ TAO_ServerRequestInfo_CORBA_Contained_version_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_version_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1677,36 +1643,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
     ,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * version
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1724,8 +1686,8 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Contained *tao_impl,
-    const char * version,
-    CORBA::Environment &
+    const char * version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1733,12 +1695,12 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1754,25 +1716,25 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_version_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_version_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1780,7 +1742,7 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1789,11 +1751,11 @@ TAO_ServerRequestInfo_CORBA_Contained_version_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_version_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_Contained_defined_in_get : public TAO_ServerRequestInfo
@@ -1802,36 +1764,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Container_ptr result);
@@ -1848,45 +1806,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::TAO_ServerRequestInfo_CORBA_Contained_defined_in_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1898,7 +1856,7 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1907,11 +1865,11 @@ TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_defined_in_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1927,36 +1885,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (char * result);
@@ -1973,45 +1927,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2023,7 +1977,7 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2032,11 +1986,11 @@ TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2052,36 +2006,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Repository_ptr result);
@@ -2098,45 +2048,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2148,7 +2098,7 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::result (CORBA::
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2157,11 +2107,11 @@ TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_most_der
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2177,36 +2127,32 @@ public:
   TAO_ServerRequestInfo_CORBA_Contained_describe (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Contained *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Contained::Description * result);
@@ -2223,45 +2169,45 @@ private:
 TAO_ServerRequestInfo_CORBA_Contained_describe::TAO_ServerRequestInfo_CORBA_Contained_describe (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_Contained *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_Contained *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_describe::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_describe::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_describe::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2273,7 +2219,7 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2282,11 +2228,11 @@ TAO_ServerRequestInfo_CORBA_Contained_describe::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_describe::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2305,36 +2251,32 @@ public:
     ,
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * new_version
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -2356,8 +2298,8 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe
     POA_CORBA_Contained *tao_impl,
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &
+    const char * new_version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2367,12 +2309,12 @@ TAO_ServerRequestInfo_CORBA_Contained_move::TAO_ServerRequestInfo_CORBA_Containe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_move::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2394,25 +2336,25 @@ TAO_ServerRequestInfo_CORBA_Contained_move::arguments (CORBA::Environment &ACE_T
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_move::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Contained_move::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Contained_move::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2420,7 +2362,7 @@ TAO_ServerRequestInfo_CORBA_Contained_move::result (CORBA::Environment &ACE_TRY_
 
 char *
 TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2429,11 +2371,11 @@ TAO_ServerRequestInfo_CORBA_Contained_move::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Contained_move::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2465,18 +2407,18 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::~_TAO_CORBA_Contained_Strategized
 
 _TAO_CORBA_Contained_Proxy_Impl&
 _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_Contained *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_Contained *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2485,8 +2427,8 @@ _TAO_CORBA_Contained_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_Contained_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2555,8 +2497,8 @@ _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2571,8 +2513,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "id",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2581,14 +2523,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
     CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2601,8 +2543,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "id",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2611,15 +2553,15 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::id (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->id (
-        id,
-        ACE_TRY_ENV
+        id
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2634,8 +2576,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "name",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2644,14 +2586,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
     CORBA_Object *_collocated_tao_target_,
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2664,8 +2606,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "name",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2674,15 +2616,15 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::name (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->name (
-        name,
-        ACE_TRY_ENV
+        name
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2697,8 +2639,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "version",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2707,14 +2649,14 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
     CORBA_Object *_collocated_tao_target_,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2727,8 +2669,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "version",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2737,15 +2679,15 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::version (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->version (
-        version,
-        ACE_TRY_ENV
+        version
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2760,8 +2702,8 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "defined_in",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2770,13 +2712,13 @@ CORBA_Container_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::defined_in (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->defined_in (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2791,8 +2733,8 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "absolute_name",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2801,13 +2743,13 @@ char * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::absolute_name (
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->absolute_name (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_repository (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2822,8 +2764,8 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "containing_repository",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2832,13 +2774,13 @@ CORBA_Repository_ptr _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::containing_reposit
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->containing_repository (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2853,8 +2795,8 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "describe",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2863,7 +2805,7 @@ CORBA_Contained::Description * _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::describe
           "IDL:omg.org/CORBA/Contained:1.0"
         )
     )->describe (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -2871,8 +2813,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
     CORBA_Object *_collocated_tao_target_,
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2885,8 +2827,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "move",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2897,8 +2839,8 @@ void _TAO_CORBA_Contained_ThruPOA_Proxy_Impl::move (
     )->move (
         new_container,
         new_name,
-        new_version,
-        ACE_TRY_ENV
+        new_version
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2927,8 +2869,8 @@ POA_CORBA_Contained::~POA_CORBA_Contained (void)
 void POA_CORBA_Contained::_get_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -2948,19 +2890,19 @@ void POA_CORBA_Contained::_get_id_skel (
   TAO_ServerRequestInfo_CORBA_Contained_id_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->id (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2969,20 +2911,20 @@ void POA_CORBA_Contained::_get_id_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3004,16 +2946,13 @@ void POA_CORBA_Contained::_get_id_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_set_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3041,39 +2980,39 @@ void POA_CORBA_Contained::_set_id_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      id.in (),
-      ACE_TRY_ENV
+      id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->id (
-          id.in (),
-          ACE_TRY_ENV
+          id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3088,16 +3027,13 @@ void POA_CORBA_Contained::_set_id_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3117,19 +3053,19 @@ void POA_CORBA_Contained::_get_name_skel (
   TAO_ServerRequestInfo_CORBA_Contained_name_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->name (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3138,20 +3074,20 @@ void POA_CORBA_Contained::_get_name_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3173,16 +3109,13 @@ void POA_CORBA_Contained::_get_name_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_set_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3210,39 +3143,39 @@ void POA_CORBA_Contained::_set_name_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      name.in (),
-      ACE_TRY_ENV
+      name.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->name (
-          name.in (),
-          ACE_TRY_ENV
+          name.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3257,16 +3190,13 @@ void POA_CORBA_Contained::_set_name_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_version_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3286,19 +3216,19 @@ void POA_CORBA_Contained::_get_version_skel (
   TAO_ServerRequestInfo_CORBA_Contained_version_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->version (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3307,20 +3237,20 @@ void POA_CORBA_Contained::_get_version_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3342,16 +3272,13 @@ void POA_CORBA_Contained::_get_version_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_set_version_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3379,39 +3306,39 @@ void POA_CORBA_Contained::_set_version_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      version.in (),
-      ACE_TRY_ENV
+      version.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->version (
-          version.in (),
-          ACE_TRY_ENV
+          version.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3426,16 +3353,13 @@ void POA_CORBA_Contained::_set_version_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_defined_in_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3455,19 +3379,19 @@ void POA_CORBA_Contained::_get_defined_in_skel (
   TAO_ServerRequestInfo_CORBA_Contained_defined_in_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->defined_in (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3476,20 +3400,20 @@ void POA_CORBA_Contained::_get_defined_in_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3511,16 +3435,13 @@ void POA_CORBA_Contained::_get_defined_in_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_absolute_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3540,19 +3461,19 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
   TAO_ServerRequestInfo_CORBA_Contained_absolute_name_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->absolute_name (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3561,20 +3482,20 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3596,16 +3517,13 @@ void POA_CORBA_Contained::_get_absolute_name_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_get_containing_repository_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3625,19 +3543,19 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
   TAO_ServerRequestInfo_CORBA_Contained_containing_repository_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->containing_repository (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3646,20 +3564,20 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3681,16 +3599,13 @@ void POA_CORBA_Contained::_get_containing_repository_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::describe_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl =
@@ -3710,19 +3625,19 @@ void POA_CORBA_Contained::describe_skel (
   TAO_ServerRequestInfo_CORBA_Contained_describe ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->describe (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3731,20 +3646,20 @@ void POA_CORBA_Contained::describe_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3766,16 +3681,13 @@ void POA_CORBA_Contained::describe_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::move_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3809,13 +3721,13 @@ void POA_CORBA_Contained::move_skel (
       _tao_impl,
       new_container.in (),
       new_name.in (),
-      new_version.in (),
-      ACE_TRY_ENV
+      new_version.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3823,27 +3735,27 @@ void POA_CORBA_Contained::move_skel (
       _tao_impl->move (
           new_container.in (),
           new_name.in (),
-          new_version.in (),
-          ACE_TRY_ENV
+          new_version.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3858,16 +3770,13 @@ void POA_CORBA_Contained::move_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Contained::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3877,7 +3786,7 @@ void POA_CORBA_Contained::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3889,12 +3798,12 @@ void POA_CORBA_Contained::_is_a_skel (
 void POA_CORBA_Contained::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3906,8 +3815,8 @@ void POA_CORBA_Contained::_non_existent_skel (
 void POA_CORBA_Contained::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained *_tao_impl = (POA_CORBA_Contained *) _tao_object_reference;
@@ -3926,7 +3835,7 @@ void POA_CORBA_Contained::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3952,11 +3861,11 @@ void POA_CORBA_Contained::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_Contained::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3981,12 +3890,12 @@ void* POA_CORBA_Contained::_downcast (
   return 0;
 }
 
-void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Contained::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -3996,9 +3905,9 @@ const char* POA_CORBA_Contained::_interface_repository_id (void) const
 }
 
 CORBA_Contained*
-POA_CORBA_Contained::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_Contained::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4170,36 +4079,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl
     ,
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * search_name
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Contained_ptr result);
@@ -4218,8 +4123,8 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Container *tao_impl,
-    const char * search_name,
-    CORBA::Environment &
+    const char * search_name
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4227,12 +4132,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::TAO_ServerRequestInfo_CORBA_Contai
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4248,25 +4153,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::arguments (CORBA::Environment &ACE
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4278,7 +4183,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4287,11 +4192,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_lookup::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4309,36 +4214,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Container *tao_impl
     ,
     CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & exclude_inherited
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ContainedSeq * result);
@@ -4359,8 +4260,8 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Container *tao_impl,
     CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &
+    const CORBA::Boolean & exclude_inherited
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4369,12 +4270,12 @@ TAO_ServerRequestInfo_CORBA_Container_contents::TAO_ServerRequestInfo_CORBA_Cont
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_contents::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4393,25 +4294,25 @@ TAO_ServerRequestInfo_CORBA_Container_contents::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_contents::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4423,7 +4324,7 @@ TAO_ServerRequestInfo_CORBA_Container_contents::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4432,11 +4333,11 @@ TAO_ServerRequestInfo_CORBA_Container_contents::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_contents::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4456,36 +4357,32 @@ public:
     const char * search_name,
     const CORBA::Long & levels_to_search,
     CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & exclude_inherited
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ContainedSeq * result);
@@ -4510,8 +4407,8 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C
     const char * search_name,
     const CORBA::Long & levels_to_search,
     CORBA::DefinitionKind & limit_type,
-    const CORBA::Boolean & exclude_inherited,
-    CORBA::Environment &
+    const CORBA::Boolean & exclude_inherited
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4522,12 +4419,12 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4552,25 +4449,25 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4582,7 +4479,7 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4591,11 +4488,11 @@ TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_lookup_name::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4614,36 +4511,32 @@ public:
     ,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
-    const CORBA::Long & max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Long & max_returned_objs
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Container::DescriptionSeq * result);
@@ -4666,8 +4559,8 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C
     POA_CORBA_Container *tao_impl,
     CORBA::DefinitionKind & limit_type,
     const CORBA::Boolean & exclude_inherited,
-    const CORBA::Long & max_returned_objs,
-    CORBA::Environment &
+    const CORBA::Long & max_returned_objs
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4677,12 +4570,12 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4704,25 +4597,25 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4734,7 +4627,7 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4743,11 +4636,11 @@ TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_describe_contents::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4766,36 +4659,32 @@ public:
     ,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * version
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ModuleDef_ptr result);
@@ -4818,8 +4707,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA
     POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &
+    const char * version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4829,12 +4718,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4856,25 +4745,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_module::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_module::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4886,7 +4775,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4895,11 +4784,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_module::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_module::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4920,36 +4809,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ConstantDef_ptr result);
@@ -4976,8 +4861,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4989,12 +4874,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5022,25 +4907,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_constant::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5052,7 +4937,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5061,11 +4946,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_constant::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_constant::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5085,36 +4970,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StructDef_ptr result);
@@ -5139,8 +5020,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5151,12 +5032,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5181,25 +5062,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_struct::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5211,7 +5092,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5220,11 +5101,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_struct::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_struct::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5245,36 +5126,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_UnionDef_ptr result);
@@ -5301,8 +5178,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5314,12 +5191,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5347,25 +5224,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_union::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_union::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5377,7 +5254,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5386,11 +5263,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_union::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_union::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5410,36 +5287,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_EnumDef_ptr result);
@@ -5464,8 +5337,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5476,12 +5349,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5506,25 +5379,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_enum::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5536,7 +5409,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5545,11 +5418,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_enum::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_enum::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5569,36 +5442,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AliasDef_ptr result);
@@ -5623,8 +5492,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5635,12 +5504,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5665,25 +5534,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_alias::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5695,7 +5564,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5704,11 +5573,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_alias::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_alias::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5728,36 +5597,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -5782,8 +5647,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5794,12 +5659,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5824,25 +5689,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_interface::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5854,7 +5719,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5863,11 +5728,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_interface::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_interface::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5893,36 +5758,32 @@ public:
     const CORBA::Boolean & is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -5959,8 +5820,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_
     const CORBA::Boolean & is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5977,12 +5838,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6025,25 +5886,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6055,7 +5916,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6064,11 +5925,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_value::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6088,36 +5949,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueBoxDef_ptr result);
@@ -6142,8 +5999,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6154,12 +6011,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6184,25 +6041,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6214,7 +6071,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6223,11 +6080,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_value_box::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6247,36 +6104,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ExceptionDef_ptr result);
@@ -6301,8 +6154,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6313,12 +6166,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6343,25 +6196,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_exception::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6373,7 +6226,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6382,11 +6235,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_exception::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_exception::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6405,36 +6258,32 @@ public:
     ,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * version
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_NativeDef_ptr result);
@@ -6457,8 +6306,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA
     POA_CORBA_Container *tao_impl,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &
+    const char * version
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6468,12 +6317,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6495,25 +6344,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_native::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_native::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6525,7 +6374,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6534,11 +6383,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_native::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_native::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6558,36 +6407,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AbstractInterfaceDef_ptr result);
@@ -6612,8 +6457,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6624,12 +6469,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::TAO_ServerReque
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6654,25 +6499,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::arguments (CORB
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6684,7 +6529,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::result (CORBA::
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6693,11 +6538,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_most_der
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_abstract_interface::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6717,36 +6562,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_LocalInterfaceDef_ptr result);
@@ -6771,8 +6612,8 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6783,12 +6624,12 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::TAO_ServerRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6813,25 +6654,25 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::arguments (CORBA::
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6843,7 +6684,7 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6852,11 +6693,11 @@ TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Container_create_local_interface::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6895,18 +6736,18 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::~_TAO_CORBA_Container_Strategized
 
 _TAO_CORBA_Container_Proxy_Impl&
 _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_Container *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_Container *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -6915,8 +6756,8 @@ _TAO_CORBA_Container_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_Container_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -6986,8 +6827,8 @@ _TAO_CORBA_Container_ThruPOA_Proxy_Impl::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
 
 CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
     CORBA_Object *_collocated_tao_target_,
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7002,8 +6843,8 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "lookup",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7012,16 +6853,16 @@ CORBA_Contained_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup (
           "IDL:omg.org/CORBA/Container:1.0"
         )
     )->lookup (
-        search_name,
-        ACE_TRY_ENV
+        search_name
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7036,8 +6877,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "contents",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7047,8 +6888,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::contents (
         )
     )->contents (
         limit_type,
-        exclude_inherited,
-        ACE_TRY_ENV
+        exclude_inherited
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7057,8 +6898,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7073,8 +6914,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "lookup_name",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7086,8 +6927,8 @@ CORBA_ContainedSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::lookup_name (
         search_name,
         levels_to_search,
         limit_type,
-        exclude_inherited,
-        ACE_TRY_ENV
+        exclude_inherited
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7095,8 +6936,8 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
     CORBA_Object *_collocated_tao_target_,
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7111,8 +6952,8 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "describe_contents",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7123,8 +6964,8 @@ CORBA_Container::DescriptionSeq * _TAO_CORBA_Container_ThruPOA_Proxy_Impl::descr
     )->describe_contents (
         limit_type,
         exclude_inherited,
-        max_returned_objs,
-        ACE_TRY_ENV
+        max_returned_objs
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7132,8 +6973,8 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7148,8 +6989,8 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_module",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7160,8 +7001,8 @@ CORBA_ModuleDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_module (
     )->create_module (
         id,
         name,
-        version,
-        ACE_TRY_ENV
+        version
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7171,8 +7012,8 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7187,8 +7028,8 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_constant",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7201,8 +7042,8 @@ CORBA_ConstantDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_constant (
         name,
         version,
         type,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7211,8 +7052,8 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7227,8 +7068,8 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_struct",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7240,8 +7081,8 @@ CORBA_StructDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_struct (
         id,
         name,
         version,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7251,8 +7092,8 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7267,8 +7108,8 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_union",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7281,8 +7122,8 @@ CORBA_UnionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_union (
         name,
         version,
         discriminator_type,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7291,8 +7132,8 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7307,8 +7148,8 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_enum",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7320,8 +7161,8 @@ CORBA_EnumDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_enum (
         id,
         name,
         version,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7330,8 +7171,8 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7346,8 +7187,8 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_alias",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7359,8 +7200,8 @@ CORBA_AliasDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_alias (
         id,
         name,
         version,
-        original_type,
-        ACE_TRY_ENV
+        original_type
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7369,8 +7210,8 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7385,8 +7226,8 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_interface",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7398,8 +7239,8 @@ CORBA_InterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_interface
         id,
         name,
         version,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7414,8 +7255,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7430,8 +7271,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7449,8 +7290,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value (
         is_truncatable,
         abstract_base_values,
         supported_interfaces,
-        initializers,
-        ACE_TRY_ENV
+        initializers
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7459,8 +7300,8 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7475,8 +7316,8 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_value_box",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7488,8 +7329,8 @@ CORBA_ValueBoxDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_value_box
         id,
         name,
         version,
-        original_type_def,
-        ACE_TRY_ENV
+        original_type_def
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7498,8 +7339,8 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7514,8 +7355,8 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_exception",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7527,8 +7368,8 @@ CORBA_ExceptionDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_exception
         id,
         name,
         version,
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7536,8 +7377,8 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
     CORBA_Object *_collocated_tao_target_,
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7552,8 +7393,8 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_native",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7564,8 +7405,8 @@ CORBA_NativeDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_native (
     )->create_native (
         id,
         name,
-        version,
-        ACE_TRY_ENV
+        version
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7574,8 +7415,8 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7590,8 +7431,8 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_abstract_interface",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7603,8 +7444,8 @@ CORBA_AbstractInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_a
         id,
         name,
         version,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7613,8 +7454,8 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7629,8 +7470,8 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_local_interface",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7642,8 +7483,8 @@ CORBA_LocalInterfaceDef_ptr _TAO_CORBA_Container_ThruPOA_Proxy_Impl::create_loca
         id,
         name,
         version,
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7671,8 +7512,8 @@ POA_CORBA_Container::~POA_CORBA_Container (void)
 void POA_CORBA_Container::lookup_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7700,20 +7541,20 @@ void POA_CORBA_Container::lookup_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      search_name.in (),
-      ACE_TRY_ENV
+      search_name.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->lookup (
-          search_name.in (),
-          ACE_TRY_ENV
+          search_name.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7722,20 +7563,20 @@ void POA_CORBA_Container::lookup_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7757,16 +7598,13 @@ void POA_CORBA_Container::lookup_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::contents_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7797,21 +7635,21 @@ void POA_CORBA_Container::contents_skel (
       _tao_upcall,
       _tao_impl,
       limit_type,
-      exclude_inherited,
-      ACE_TRY_ENV
+      exclude_inherited
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->contents (
           limit_type,
-          exclude_inherited,
-          ACE_TRY_ENV
+          exclude_inherited
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7820,20 +7658,20 @@ void POA_CORBA_Container::contents_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7855,16 +7693,13 @@ void POA_CORBA_Container::contents_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::lookup_name_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7901,13 +7736,13 @@ void POA_CORBA_Container::lookup_name_skel (
       search_name.in (),
       levels_to_search,
       limit_type,
-      exclude_inherited,
-      ACE_TRY_ENV
+      exclude_inherited
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7916,8 +7751,8 @@ void POA_CORBA_Container::lookup_name_skel (
           search_name.in (),
           levels_to_search,
           limit_type,
-          exclude_inherited,
-          ACE_TRY_ENV
+          exclude_inherited
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7926,20 +7761,20 @@ void POA_CORBA_Container::lookup_name_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7961,16 +7796,13 @@ void POA_CORBA_Container::lookup_name_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::describe_contents_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8004,13 +7836,13 @@ void POA_CORBA_Container::describe_contents_skel (
       _tao_impl,
       limit_type,
       exclude_inherited,
-      max_returned_objs,
-      ACE_TRY_ENV
+      max_returned_objs
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8018,8 +7850,8 @@ void POA_CORBA_Container::describe_contents_skel (
       _tao_impl->describe_contents (
           limit_type,
           exclude_inherited,
-          max_returned_objs,
-          ACE_TRY_ENV
+          max_returned_objs
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8028,20 +7860,20 @@ void POA_CORBA_Container::describe_contents_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8063,16 +7895,13 @@ void POA_CORBA_Container::describe_contents_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_module_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8106,13 +7935,13 @@ void POA_CORBA_Container::create_module_skel (
       _tao_impl,
       id.in (),
       name.in (),
-      version.in (),
-      ACE_TRY_ENV
+      version.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8120,8 +7949,8 @@ void POA_CORBA_Container::create_module_skel (
       _tao_impl->create_module (
           id.in (),
           name.in (),
-          version.in (),
-          ACE_TRY_ENV
+          version.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8130,20 +7959,20 @@ void POA_CORBA_Container::create_module_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8165,16 +7994,13 @@ void POA_CORBA_Container::create_module_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_constant_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8214,13 +8040,13 @@ void POA_CORBA_Container::create_constant_skel (
       name.in (),
       version.in (),
       type.in (),
-      value,
-      ACE_TRY_ENV
+      value
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8230,8 +8056,8 @@ void POA_CORBA_Container::create_constant_skel (
           name.in (),
           version.in (),
           type.in (),
-          value,
-          ACE_TRY_ENV
+          value
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8240,20 +8066,20 @@ void POA_CORBA_Container::create_constant_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8275,16 +8101,13 @@ void POA_CORBA_Container::create_constant_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_struct_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8321,13 +8144,13 @@ void POA_CORBA_Container::create_struct_skel (
       id.in (),
       name.in (),
       version.in (),
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8336,8 +8159,8 @@ void POA_CORBA_Container::create_struct_skel (
           id.in (),
           name.in (),
           version.in (),
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8346,20 +8169,20 @@ void POA_CORBA_Container::create_struct_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8381,16 +8204,13 @@ void POA_CORBA_Container::create_struct_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_union_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8430,13 +8250,13 @@ void POA_CORBA_Container::create_union_skel (
       name.in (),
       version.in (),
       discriminator_type.in (),
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8446,8 +8266,8 @@ void POA_CORBA_Container::create_union_skel (
           name.in (),
           version.in (),
           discriminator_type.in (),
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8456,20 +8276,20 @@ void POA_CORBA_Container::create_union_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8491,16 +8311,13 @@ void POA_CORBA_Container::create_union_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_enum_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8537,13 +8354,13 @@ void POA_CORBA_Container::create_enum_skel (
       id.in (),
       name.in (),
       version.in (),
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8552,8 +8369,8 @@ void POA_CORBA_Container::create_enum_skel (
           id.in (),
           name.in (),
           version.in (),
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8562,20 +8379,20 @@ void POA_CORBA_Container::create_enum_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8597,16 +8414,13 @@ void POA_CORBA_Container::create_enum_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_alias_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8643,13 +8457,13 @@ void POA_CORBA_Container::create_alias_skel (
       id.in (),
       name.in (),
       version.in (),
-      original_type.in (),
-      ACE_TRY_ENV
+      original_type.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8658,8 +8472,8 @@ void POA_CORBA_Container::create_alias_skel (
           id.in (),
           name.in (),
           version.in (),
-          original_type.in (),
-          ACE_TRY_ENV
+          original_type.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8668,20 +8482,20 @@ void POA_CORBA_Container::create_alias_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8703,16 +8517,13 @@ void POA_CORBA_Container::create_alias_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8749,13 +8560,13 @@ void POA_CORBA_Container::create_interface_skel (
       id.in (),
       name.in (),
       version.in (),
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8764,8 +8575,8 @@ void POA_CORBA_Container::create_interface_skel (
           id.in (),
           name.in (),
           version.in (),
-          base_interfaces,
-          ACE_TRY_ENV
+          base_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8774,20 +8585,20 @@ void POA_CORBA_Container::create_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8809,16 +8620,13 @@ void POA_CORBA_Container::create_interface_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8873,13 +8681,13 @@ void POA_CORBA_Container::create_value_skel (
       is_truncatable,
       abstract_base_values,
       supported_interfaces,
-      initializers,
-      ACE_TRY_ENV
+      initializers
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8894,8 +8702,8 @@ void POA_CORBA_Container::create_value_skel (
           is_truncatable,
           abstract_base_values,
           supported_interfaces,
-          initializers,
-          ACE_TRY_ENV
+          initializers
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8904,20 +8712,20 @@ void POA_CORBA_Container::create_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8939,16 +8747,13 @@ void POA_CORBA_Container::create_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_value_box_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8985,13 +8790,13 @@ void POA_CORBA_Container::create_value_box_skel (
       id.in (),
       name.in (),
       version.in (),
-      original_type_def.in (),
-      ACE_TRY_ENV
+      original_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9000,8 +8805,8 @@ void POA_CORBA_Container::create_value_box_skel (
           id.in (),
           name.in (),
           version.in (),
-          original_type_def.in (),
-          ACE_TRY_ENV
+          original_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9010,20 +8815,20 @@ void POA_CORBA_Container::create_value_box_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9045,16 +8850,13 @@ void POA_CORBA_Container::create_value_box_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_exception_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9091,13 +8893,13 @@ void POA_CORBA_Container::create_exception_skel (
       id.in (),
       name.in (),
       version.in (),
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9106,8 +8908,8 @@ void POA_CORBA_Container::create_exception_skel (
           id.in (),
           name.in (),
           version.in (),
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9116,20 +8918,20 @@ void POA_CORBA_Container::create_exception_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9151,16 +8953,13 @@ void POA_CORBA_Container::create_exception_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_native_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9194,13 +8993,13 @@ void POA_CORBA_Container::create_native_skel (
       _tao_impl,
       id.in (),
       name.in (),
-      version.in (),
-      ACE_TRY_ENV
+      version.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9208,8 +9007,8 @@ void POA_CORBA_Container::create_native_skel (
       _tao_impl->create_native (
           id.in (),
           name.in (),
-          version.in (),
-          ACE_TRY_ENV
+          version.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9218,20 +9017,20 @@ void POA_CORBA_Container::create_native_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9253,16 +9052,13 @@ void POA_CORBA_Container::create_native_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_abstract_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9299,13 +9095,13 @@ void POA_CORBA_Container::create_abstract_interface_skel (
       id.in (),
       name.in (),
       version.in (),
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9314,8 +9110,8 @@ void POA_CORBA_Container::create_abstract_interface_skel (
           id.in (),
           name.in (),
           version.in (),
-          base_interfaces,
-          ACE_TRY_ENV
+          base_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9324,20 +9120,20 @@ void POA_CORBA_Container::create_abstract_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9359,16 +9155,13 @@ void POA_CORBA_Container::create_abstract_interface_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::create_local_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9405,13 +9198,13 @@ void POA_CORBA_Container::create_local_interface_skel (
       id.in (),
       name.in (),
       version.in (),
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9420,8 +9213,8 @@ void POA_CORBA_Container::create_local_interface_skel (
           id.in (),
           name.in (),
           version.in (),
-          base_interfaces,
-          ACE_TRY_ENV
+          base_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9430,20 +9223,20 @@ void POA_CORBA_Container::create_local_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9465,16 +9258,13 @@ void POA_CORBA_Container::create_local_interface_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Container::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9484,7 +9274,7 @@ void POA_CORBA_Container::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9496,12 +9286,12 @@ void POA_CORBA_Container::_is_a_skel (
 void POA_CORBA_Container::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9513,8 +9303,8 @@ void POA_CORBA_Container::_non_existent_skel (
 void POA_CORBA_Container::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container *_tao_impl = (POA_CORBA_Container *) _tao_object_reference;
@@ -9533,7 +9323,7 @@ void POA_CORBA_Container::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9559,11 +9349,11 @@ void POA_CORBA_Container::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_Container::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9588,12 +9378,12 @@ void* POA_CORBA_Container::_downcast (
   return 0;
 }
 
-void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Container::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9603,9 +9393,9 @@ const char* POA_CORBA_Container::_interface_repository_id (void) const
 }
 
 CORBA_Container*
-POA_CORBA_Container::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_Container::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9740,36 +9530,32 @@ public:
   TAO_ServerRequestInfo_CORBA_IDLType_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_IDLType *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -9786,45 +9572,45 @@ private:
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::TAO_ServerRequestInfo_CORBA_IDLType_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_IDLType *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_IDLType *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IDLType_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IDLType_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9836,7 +9622,7 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9845,11 +9631,11 @@ TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_IDLType_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9888,18 +9674,18 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::~_TAO_CORBA_IDLType_Strategized_Pro
 
 _TAO_CORBA_IDLType_Proxy_Impl&
 _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_IDLType *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_IDLType *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9908,8 +9694,8 @@ _TAO_CORBA_IDLType_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_IDLType_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9978,8 +9764,8 @@ _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (vo
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9994,8 +9780,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -10004,7 +9790,7 @@ CORBA::TypeCode_ptr _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/IDLType:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -10032,8 +9818,8 @@ POA_CORBA_IDLType::~POA_CORBA_IDLType (void)
 void POA_CORBA_IDLType::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType *_tao_impl =
@@ -10053,19 +9839,19 @@ void POA_CORBA_IDLType::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_IDLType_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -10074,20 +9860,20 @@ void POA_CORBA_IDLType::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10109,16 +9895,13 @@ void POA_CORBA_IDLType::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_IDLType::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10128,7 +9911,7 @@ void POA_CORBA_IDLType::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10140,12 +9923,12 @@ void POA_CORBA_IDLType::_is_a_skel (
 void POA_CORBA_IDLType::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10157,8 +9940,8 @@ void POA_CORBA_IDLType::_non_existent_skel (
 void POA_CORBA_IDLType::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType *_tao_impl = (POA_CORBA_IDLType *) _tao_object_reference;
@@ -10177,7 +9960,7 @@ void POA_CORBA_IDLType::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10203,11 +9986,11 @@ void POA_CORBA_IDLType::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_IDLType::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10232,12 +10015,12 @@ void* POA_CORBA_IDLType::_downcast (
   return 0;
 }
 
-void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_IDLType::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10247,9 +10030,9 @@ const char* POA_CORBA_IDLType::_interface_repository_id (void) const
 }
 
 CORBA_IDLType*
-POA_CORBA_IDLType::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_IDLType::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10437,18 +10220,18 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::~_TAO_CORBA_TypedefDef_Strategiz
 
 _TAO_CORBA_TypedefDef_Proxy_Impl&
 _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_TypedefDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_TypedefDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10457,8 +10240,8 @@ _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10552,8 +10335,8 @@ POA_CORBA_TypedefDef::~POA_CORBA_TypedefDef (void)
 void POA_CORBA_TypedefDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10563,7 +10346,7 @@ void POA_CORBA_TypedefDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10575,12 +10358,12 @@ void POA_CORBA_TypedefDef::_is_a_skel (
 void POA_CORBA_TypedefDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10592,8 +10375,8 @@ void POA_CORBA_TypedefDef::_non_existent_skel (
 void POA_CORBA_TypedefDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_TypedefDef *_tao_impl = (POA_CORBA_TypedefDef *) _tao_object_reference;
@@ -10612,7 +10395,7 @@ void POA_CORBA_TypedefDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10638,11 +10421,11 @@ void POA_CORBA_TypedefDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_TypedefDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10673,12 +10456,12 @@ void* POA_CORBA_TypedefDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_TypedefDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10688,9 +10471,9 @@ const char* POA_CORBA_TypedefDef::_interface_repository_id (void) const
 }
 
 CORBA_TypedefDef*
-POA_CORBA_TypedefDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_TypedefDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
index c06ea700b74..245cba71f61 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.h
@@ -63,10 +63,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -75,65 +74,62 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_IRObject *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_def_kind_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void destroy_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
 
@@ -141,19 +137,19 @@ public:
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_IRObject_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IRObject_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_IRObject_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_IRObject_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_IRObject_Proxy_Impl &select_proxy (
-    ::CORBA_IRObject *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_IRObject *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -161,18 +157,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_IRObject_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -184,7 +180,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -192,32 +188,32 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_IRObject_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl
 {
 public:
   _TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::DefinitionKind def_kind (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void destroy (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -242,10 +238,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -254,242 +249,228 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_Contained *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_id_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_id_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_name_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_name_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_version_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_version_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_defined_in_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_absolute_name_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_containing_repository_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void describe_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void move_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_Contained_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Contained_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_Contained_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_Contained_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_Contained_Proxy_Impl &select_proxy (
-    ::CORBA_Contained *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_Contained *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -497,18 +478,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_Contained_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -520,7 +501,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -528,112 +509,112 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_Contained_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_Contained_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_Contained_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_Contained_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_Contained_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual char * id (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void id (
       CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * id
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual char * name (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void name (
       CORBA_Object *_collocated_tao_target_,
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * name
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual char * version (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void version (
       CORBA_Object *_collocated_tao_target_,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * version
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_Container_ptr defined_in (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual char * absolute_name (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_Repository_ptr containing_repository (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_Contained::Description * describe (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void move (
       CORBA_Object *_collocated_tao_target_,
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * new_version
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -658,10 +639,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -670,123 +650,117 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_Container *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void lookup_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void contents_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void lookup_name_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void describe_contents_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_module_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ConstantDef_ptr create_constant (
@@ -794,38 +768,36 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_constant_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_struct_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_UnionDef_ptr create_union (
@@ -833,76 +805,72 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_union_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_enum_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_alias_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_interface_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDef_ptr create_value (
@@ -915,149 +883,141 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_value_box_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_exception_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_native_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_abstract_interface_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_local_interface_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_Container_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Container_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_Container_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_Container_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_Container_Proxy_Impl &select_proxy (
-    ::CORBA_Container *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_Container *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1065,18 +1025,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_Container_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1088,7 +1048,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1096,144 +1056,144 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_Container_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_Container_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_Container_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_Container_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_Container_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_Contained_ptr lookup (
       CORBA_Object *_collocated_tao_target_,
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * search_name
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ContainedSeq * contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ContainedSeq * lookup_name (
       CORBA_Object *_collocated_tao_target_,
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_Container::DescriptionSeq * describe_contents (
       CORBA_Object *_collocated_tao_target_,
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ModuleDef_ptr create_module (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * version
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ConstantDef_ptr create_constant (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_StructDef_ptr create_struct (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_UnionDef_ptr create_union (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_EnumDef_ptr create_enum (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_AliasDef_ptr create_alias (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_InterfaceDef_ptr create_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueDef_ptr create_value (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
@@ -1245,73 +1205,73 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueBoxDef_ptr create_value_box (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ExceptionDef_ptr create_exception (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_NativeDef_ptr create_native (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * version
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_LocalInterfaceDef_ptr create_local_interface (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1336,10 +1296,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1348,86 +1307,82 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_IDLType *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_IDLType_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_IDLType_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_IDLType_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_IDLType_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_IDLType_Proxy_Impl &select_proxy (
-    ::CORBA_IDLType *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_IDLType *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1435,18 +1390,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_IDLType_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1458,7 +1413,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1466,26 +1421,26 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_IDLType_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IRObject_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1510,10 +1465,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1522,167 +1476,152 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_TypedefDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_TypedefDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_TypedefDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl &select_proxy (
-    ::CORBA_TypedefDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_TypedefDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1690,18 +1629,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_TypedefDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1713,7 +1652,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1721,18 +1660,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_TypedefDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
index 31bdd6252fd..477a44b0871 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS.i
@@ -22,300 +22,300 @@
 ACE_INLINE void POA_CORBA_Contained::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Contained::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Contained_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Container::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Container::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Container_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_IDLType::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_IDLType::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_IDLType_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_TypedefDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_TypedefDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
index fb327f82865..87fb981b893 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.h
@@ -52,7 +52,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_IRObject_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -64,33 +64,30 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_IRObject_tie (const POA_CORBA_IRObject_tie &);
   void operator= (const POA_CORBA_IRObject_tie &);
@@ -111,7 +108,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_Contained_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -123,127 +120,113 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_Contained_tie (const POA_CORBA_Contained_tie &);
   void operator= (const POA_CORBA_Contained_tie &);
@@ -264,7 +247,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_Container_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -276,139 +259,127 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -419,94 +390,86 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_Container_tie (const POA_CORBA_Container_tie &);
   void operator= (const POA_CORBA_Container_tie &);
@@ -527,7 +490,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_IDLType_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -539,41 +502,37 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_IDLType_tie (const POA_CORBA_IDLType_tie &);
   void operator= (const POA_CORBA_IDLType_tie &);
@@ -594,7 +553,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_TypedefDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -606,135 +565,120 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_TypedefDef_tie (const POA_CORBA_TypedefDef_tie &);
   void operator= (const POA_CORBA_TypedefDef_tie &);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
index c2619822298..ee67530cc11 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BaseS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IRObject_tie<T>::POA_CORBA_IRObject_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -90,66 +90,66 @@ POA_CORBA_IRObject_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_IRObject_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_IRObject_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_IRObject::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_IRObject::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_IRObject_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_IRObject_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Contained_tie<T>::POA_CORBA_Contained_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -193,147 +193,147 @@ POA_CORBA_Contained_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Contained_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Contained_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Contained::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Contained::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_Contained_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_Contained_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_Contained_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_Contained_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -341,8 +341,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -351,63 +351,63 @@ void POA_CORBA_Contained_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_Contained_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Contained_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Container_tie<T>::POA_CORBA_Container_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -451,34 +451,34 @@ POA_CORBA_Container_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Container_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Container_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Container::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Container::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_Container_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -486,8 +486,8 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -496,8 +496,8 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -507,8 +507,8 @@ CORBA_ContainedSeq * POA_CORBA_Container_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -516,8 +516,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -526,8 +526,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Container_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -535,8 +535,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_Container_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -545,8 +545,8 @@ CORBA_ModuleDef_ptr POA_CORBA_Container_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -556,8 +556,8 @@ CORBA_ConstantDef_ptr POA_CORBA_Container_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -568,8 +568,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -578,8 +578,8 @@ CORBA_StructDef_ptr POA_CORBA_Container_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -589,8 +589,8 @@ CORBA_StructDef_ptr POA_CORBA_Container_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -600,8 +600,8 @@ CORBA_UnionDef_ptr POA_CORBA_Container_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -612,8 +612,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -622,8 +622,8 @@ CORBA_EnumDef_ptr POA_CORBA_Container_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -633,8 +633,8 @@ CORBA_EnumDef_ptr POA_CORBA_Container_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -643,8 +643,8 @@ CORBA_AliasDef_ptr POA_CORBA_Container_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -654,8 +654,8 @@ CORBA_AliasDef_ptr POA_CORBA_Container_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -664,8 +664,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_Container_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -675,8 +675,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_Container_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -691,8 +691,8 @@ CORBA_ValueDef_ptr POA_CORBA_Container_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -708,8 +708,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -718,8 +718,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Container_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -729,8 +729,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Container_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -739,8 +739,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_Container_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -750,8 +750,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_Container_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -759,8 +759,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_Container_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -769,8 +769,8 @@ CORBA_NativeDef_ptr POA_CORBA_Container_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -779,8 +779,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_abstract_inter
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -790,8 +790,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_abstract_inter
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -800,8 +800,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -811,63 +811,63 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Container_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_Container_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Container_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_IDLType_tie<T>::POA_CORBA_IDLType_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -911,79 +911,79 @@ POA_CORBA_IDLType_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_IDLType_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_IDLType_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_IDLType::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_IDLType::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_IDLType_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_IDLType_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_IDLType_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_TypedefDef_tie<T>::POA_CORBA_TypedefDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1027,147 +1027,147 @@ POA_CORBA_TypedefDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_TypedefDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_TypedefDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_TypedefDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_TypedefDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_TypedefDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_TypedefDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_TypedefDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_TypedefDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1175,8 +1175,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1185,47 +1185,47 @@ void POA_CORBA_TypedefDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_TypedefDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_TypedefDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_TypedefDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
index c8f2423cca2..40d924df88c 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.cpp
@@ -209,36 +209,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * search_id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_Contained_ptr result);
@@ -257,8 +253,8 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    const char * search_id,
-    CORBA::Environment &
+    const char * search_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -266,12 +262,12 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::TAO_ServerRequestInfo_CORBA_Re
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -287,25 +283,25 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -317,7 +313,7 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -326,11 +322,11 @@ TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_lookup_id::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -347,36 +343,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -395,8 +387,8 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -404,12 +396,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -425,25 +417,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -455,7 +447,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -464,11 +456,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_get_canonical_typecode::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -485,36 +477,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    CORBA::PrimitiveKind & kind,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::PrimitiveKind & kind
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_PrimitiveDef_ptr result);
@@ -533,8 +521,8 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    CORBA::PrimitiveKind & kind,
-    CORBA::Environment &
+    CORBA::PrimitiveKind & kind
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -542,12 +530,12 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -563,25 +551,25 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -593,7 +581,7 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -602,11 +590,11 @@ TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_get_primitive::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -623,36 +611,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StringDef_ptr result);
@@ -671,8 +655,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -680,12 +664,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -701,25 +685,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_string::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -731,7 +715,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -740,11 +724,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_string::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_string::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -761,36 +745,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_WstringDef_ptr result);
@@ -809,8 +789,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -818,12 +798,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -839,25 +819,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -869,7 +849,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -878,11 +858,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_wstring::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -900,36 +880,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     const CORBA::ULong & bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_SequenceDef_ptr result);
@@ -950,8 +926,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -960,12 +936,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::TAO_ServerRequestInfo_CO
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -984,25 +960,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1014,7 +990,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1023,11 +999,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_sequence::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1045,36 +1021,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     const CORBA::ULong & length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ArrayDef_ptr result);
@@ -1095,8 +1067,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     const CORBA::ULong & length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1105,12 +1077,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1129,25 +1101,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_array::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1159,7 +1131,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1168,11 +1140,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_array::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_array::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1190,36 +1162,32 @@ public:
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_Repository *tao_impl
     ,
     const CORBA::UShort & digits,
-    const CORBA::Short & scale,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_FixedDef_ptr result);
@@ -1240,8 +1208,8 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_Repository *tao_impl,
     const CORBA::UShort & digits,
-    const CORBA::Short & scale,
-    CORBA::Environment &
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1250,12 +1218,12 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1274,25 +1242,25 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1304,7 +1272,7 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1313,11 +1281,11 @@ TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_Repository_create_fixed::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1356,18 +1324,18 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::~_TAO_CORBA_Repository_Strategiz
 
 _TAO_CORBA_Repository_Proxy_Impl&
 _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_Repository *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_Repository *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -1376,8 +1344,8 @@ _TAO_CORBA_Repository_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_Repository_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -1447,8 +1415,8 @@ _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::_TAO_CORBA_Repository_ThruPOA_Proxy_Im
 
 CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
     CORBA_Object *_collocated_tao_target_,
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1463,8 +1431,8 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "lookup_id",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1473,15 +1441,15 @@ CORBA_Contained_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::lookup_id (
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->lookup_id (
-        search_id,
-        ACE_TRY_ENV
+        search_id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_typecode (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1496,8 +1464,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "get_canonical_typecode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1506,15 +1474,15 @@ CORBA::TypeCode_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_canonical_type
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->get_canonical_typecode (
-        tc,
-        ACE_TRY_ENV
+        tc
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::PrimitiveKind kind,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PrimitiveKind kind
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1529,8 +1497,8 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "get_primitive",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1539,15 +1507,15 @@ CORBA_PrimitiveDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::get_primitive (
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->get_primitive (
-        kind,
-        ACE_TRY_ENV
+        kind
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1562,8 +1530,8 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_string",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1572,15 +1540,15 @@ CORBA_StringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_string (
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_string (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1595,8 +1563,8 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_wstring",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1605,16 +1573,16 @@ CORBA_WstringDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_wstring (
           "IDL:omg.org/CORBA/Repository:1.0"
         )
     )->create_wstring (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1629,8 +1597,8 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_sequence",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1640,16 +1608,16 @@ CORBA_SequenceDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_sequence
         )
     )->create_sequence (
         bound,
-        element_type,
-        ACE_TRY_ENV
+        element_type
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
     CORBA_Object *_collocated_tao_target_,
     CORBA::ULong length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1664,8 +1632,8 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_array",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1675,16 +1643,16 @@ CORBA_ArrayDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_array (
         )
     )->create_array (
         length,
-        element_type,
-        ACE_TRY_ENV
+        element_type
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
     CORBA_Object *_collocated_tao_target_,
     CORBA::UShort digits,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1699,8 +1667,8 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_fixed",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1710,8 +1678,8 @@ CORBA_FixedDef_ptr _TAO_CORBA_Repository_ThruPOA_Proxy_Impl::create_fixed (
         )
     )->create_fixed (
         digits,
-        scale,
-        ACE_TRY_ENV
+        scale
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -1740,8 +1708,8 @@ POA_CORBA_Repository::~POA_CORBA_Repository (void)
 void POA_CORBA_Repository::lookup_id_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1769,20 +1737,20 @@ void POA_CORBA_Repository::lookup_id_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      search_id.in (),
-      ACE_TRY_ENV
+      search_id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->lookup_id (
-          search_id.in (),
-          ACE_TRY_ENV
+          search_id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1791,20 +1759,20 @@ void POA_CORBA_Repository::lookup_id_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1826,16 +1794,13 @@ void POA_CORBA_Repository::lookup_id_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::get_canonical_typecode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1863,20 +1828,20 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      tc.in (),
-      ACE_TRY_ENV
+      tc.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->get_canonical_typecode (
-          tc.in (),
-          ACE_TRY_ENV
+          tc.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1885,20 +1850,20 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1920,16 +1885,13 @@ void POA_CORBA_Repository::get_canonical_typecode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::get_primitive_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1957,20 +1919,20 @@ void POA_CORBA_Repository::get_primitive_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      kind,
-      ACE_TRY_ENV
+      kind
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->get_primitive (
-          kind,
-          ACE_TRY_ENV
+          kind
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1979,20 +1941,20 @@ void POA_CORBA_Repository::get_primitive_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2014,16 +1976,13 @@ void POA_CORBA_Repository::get_primitive_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_string_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2051,20 +2010,20 @@ void POA_CORBA_Repository::create_string_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_string (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2073,20 +2032,20 @@ void POA_CORBA_Repository::create_string_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2108,16 +2067,13 @@ void POA_CORBA_Repository::create_string_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_wstring_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2145,20 +2101,20 @@ void POA_CORBA_Repository::create_wstring_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_wstring (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2167,20 +2123,20 @@ void POA_CORBA_Repository::create_wstring_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2202,16 +2158,13 @@ void POA_CORBA_Repository::create_wstring_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_sequence_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2242,21 +2195,21 @@ void POA_CORBA_Repository::create_sequence_skel (
       _tao_upcall,
       _tao_impl,
       bound,
-      element_type.in (),
-      ACE_TRY_ENV
+      element_type.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_sequence (
           bound,
-          element_type.in (),
-          ACE_TRY_ENV
+          element_type.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2265,20 +2218,20 @@ void POA_CORBA_Repository::create_sequence_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2300,16 +2253,13 @@ void POA_CORBA_Repository::create_sequence_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_array_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2340,21 +2290,21 @@ void POA_CORBA_Repository::create_array_skel (
       _tao_upcall,
       _tao_impl,
       length,
-      element_type.in (),
-      ACE_TRY_ENV
+      element_type.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_array (
           length,
-          element_type.in (),
-          ACE_TRY_ENV
+          element_type.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2363,20 +2313,20 @@ void POA_CORBA_Repository::create_array_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2398,16 +2348,13 @@ void POA_CORBA_Repository::create_array_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::create_fixed_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2438,21 +2385,21 @@ void POA_CORBA_Repository::create_fixed_skel (
       _tao_upcall,
       _tao_impl,
       digits,
-      scale,
-      ACE_TRY_ENV
+      scale
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->create_fixed (
           digits,
-          scale,
-          ACE_TRY_ENV
+          scale
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2461,20 +2408,20 @@ void POA_CORBA_Repository::create_fixed_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2496,16 +2443,13 @@ void POA_CORBA_Repository::create_fixed_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_Repository::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2515,7 +2459,7 @@ void POA_CORBA_Repository::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2527,12 +2471,12 @@ void POA_CORBA_Repository::_is_a_skel (
 void POA_CORBA_Repository::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2544,8 +2488,8 @@ void POA_CORBA_Repository::_non_existent_skel (
 void POA_CORBA_Repository::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository *_tao_impl = (POA_CORBA_Repository *) _tao_object_reference;
@@ -2564,7 +2508,7 @@ void POA_CORBA_Repository::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -2590,11 +2534,11 @@ void POA_CORBA_Repository::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_Repository::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -2622,12 +2566,12 @@ void* POA_CORBA_Repository::_downcast (
   return 0;
 }
 
-void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_Repository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -2637,9 +2581,9 @@ const char* POA_CORBA_Repository::_interface_repository_id (void) const
 }
 
 CORBA_Repository*
-POA_CORBA_Repository::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_Repository::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -2846,18 +2790,18 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::~_TAO_CORBA_ModuleDef_Strategized
 
 _TAO_CORBA_ModuleDef_Proxy_Impl&
 _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ModuleDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ModuleDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2866,8 +2810,8 @@ _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2961,8 +2905,8 @@ POA_CORBA_ModuleDef::~POA_CORBA_ModuleDef (void)
 void POA_CORBA_ModuleDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2972,7 +2916,7 @@ void POA_CORBA_ModuleDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2984,12 +2928,12 @@ void POA_CORBA_ModuleDef::_is_a_skel (
 void POA_CORBA_ModuleDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3001,8 +2945,8 @@ void POA_CORBA_ModuleDef::_non_existent_skel (
 void POA_CORBA_ModuleDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ModuleDef *_tao_impl = (POA_CORBA_ModuleDef *) _tao_object_reference;
@@ -3021,7 +2965,7 @@ void POA_CORBA_ModuleDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3047,11 +2991,11 @@ void POA_CORBA_ModuleDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ModuleDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3082,12 +3026,12 @@ void* POA_CORBA_ModuleDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ModuleDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -3097,9 +3041,9 @@ const char* POA_CORBA_ModuleDef::_interface_repository_id (void) const
 }
 
 CORBA_ModuleDef*
-POA_CORBA_ModuleDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ModuleDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3269,36 +3213,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -3315,45 +3255,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ConstantDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ConstantDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3365,7 +3305,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3374,11 +3314,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3394,36 +3334,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -3440,45 +3376,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ConstantDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ConstantDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3490,7 +3426,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3499,11 +3435,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3520,36 +3456,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
     ,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3567,8 +3499,8 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstantDef *tao_impl,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3576,12 +3508,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3597,25 +3529,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3623,7 +3555,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3632,11 +3564,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ConstantDef_value_get : public TAO_ServerRequestInfo
@@ -3645,36 +3577,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Any * result);
@@ -3691,45 +3619,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::TAO_ServerRequestInfo_CORBA_ConstantDef_value_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ConstantDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ConstantDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3741,7 +3669,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3750,11 +3678,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3771,36 +3699,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ConstantDef *tao_impl
     ,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3818,8 +3742,8 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ConstantDef *tao_impl,
-    const CORBA::Any & value,
-    CORBA::Environment &
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3827,12 +3751,12 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::TAO_ServerRequestInfo_CORBA_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3848,25 +3772,25 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3874,7 +3798,7 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3883,11 +3807,11 @@ TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ConstantDef_value_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -3919,18 +3843,18 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::~_TAO_CORBA_ConstantDef_Strateg
 
 _TAO_CORBA_ConstantDef_Proxy_Impl&
 _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ConstantDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ConstantDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -3939,8 +3863,8 @@ _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -4009,8 +3933,8 @@ _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ConstantDef_ThruPOA_Proxy_
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4025,8 +3949,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -4035,13 +3959,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4056,8 +3980,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -4066,14 +3990,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4086,8 +4010,8 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -4096,15 +4020,15 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->type_def (
-        type_def,
-        ACE_TRY_ENV
+        type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4119,8 +4043,8 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -4129,14 +4053,14 @@ CORBA::Any * _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4149,8 +4073,8 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -4159,8 +4083,8 @@ void _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl::value (
           "IDL:omg.org/CORBA/ConstantDef:1.0"
         )
     )->value (
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -4190,8 +4114,8 @@ POA_CORBA_ConstantDef::~POA_CORBA_ConstantDef (void)
 void POA_CORBA_ConstantDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl =
@@ -4211,19 +4135,19 @@ void POA_CORBA_ConstantDef::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4232,20 +4156,20 @@ void POA_CORBA_ConstantDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4267,16 +4191,13 @@ void POA_CORBA_ConstantDef::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl =
@@ -4296,19 +4217,19 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
   TAO_ServerRequestInfo_CORBA_ConstantDef_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4317,20 +4238,20 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4352,16 +4273,13 @@ void POA_CORBA_ConstantDef::_get_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4389,39 +4307,39 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      type_def.in (),
-      ACE_TRY_ENV
+      type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->type_def (
-          type_def.in (),
-          ACE_TRY_ENV
+          type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4436,16 +4354,13 @@ void POA_CORBA_ConstantDef::_set_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_get_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl =
@@ -4465,19 +4380,19 @@ void POA_CORBA_ConstantDef::_get_value_skel (
   TAO_ServerRequestInfo_CORBA_ConstantDef_value_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->value (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -4486,20 +4401,20 @@ void POA_CORBA_ConstantDef::_get_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4521,16 +4436,13 @@ void POA_CORBA_ConstantDef::_get_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_set_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4558,39 +4470,39 @@ void POA_CORBA_ConstantDef::_set_value_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      value,
-      ACE_TRY_ENV
+      value
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->value (
-          value,
-          ACE_TRY_ENV
+          value
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -4605,16 +4517,13 @@ void POA_CORBA_ConstantDef::_set_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ConstantDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4624,7 +4533,7 @@ void POA_CORBA_ConstantDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4636,12 +4545,12 @@ void POA_CORBA_ConstantDef::_is_a_skel (
 void POA_CORBA_ConstantDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4653,8 +4562,8 @@ void POA_CORBA_ConstantDef::_non_existent_skel (
 void POA_CORBA_ConstantDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ConstantDef *_tao_impl = (POA_CORBA_ConstantDef *) _tao_object_reference;
@@ -4673,7 +4582,7 @@ void POA_CORBA_ConstantDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4699,11 +4608,11 @@ void POA_CORBA_ConstantDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ConstantDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4731,12 +4640,12 @@ void* POA_CORBA_ConstantDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ConstantDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -4746,9 +4655,9 @@ const char* POA_CORBA_ConstantDef::_interface_repository_id (void) const
 }
 
 CORBA_ConstantDef*
-POA_CORBA_ConstantDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ConstantDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4935,36 +4844,32 @@ public:
   TAO_ServerRequestInfo_CORBA_StructDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StructMemberSeq * result);
@@ -4981,45 +4886,45 @@ private:
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::TAO_ServerRequestInfo_CORBA_StructDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_StructDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_StructDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5031,7 +4936,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5040,11 +4945,11 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StructDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5061,36 +4966,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StructDef *tao_impl
     ,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -5108,8 +5009,8 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_StructDef *tao_impl,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5117,12 +5018,12 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::TAO_ServerRequestInfo_CORBA_S
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5138,25 +5039,25 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5164,7 +5065,7 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5173,11 +5074,11 @@ TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StructDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -5209,18 +5110,18 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::~_TAO_CORBA_StructDef_Strategized
 
 _TAO_CORBA_StructDef_Proxy_Impl&
 _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_StructDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_StructDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -5229,8 +5130,8 @@ _TAO_CORBA_StructDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_StructDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -5299,8 +5200,8 @@ _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5315,8 +5216,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -5325,14 +5226,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5345,8 +5246,8 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -5355,8 +5256,8 @@ void _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/StructDef:1.0"
         )
     )->members (
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -5389,8 +5290,8 @@ POA_CORBA_StructDef::~POA_CORBA_StructDef (void)
 void POA_CORBA_StructDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StructDef *_tao_impl =
@@ -5410,19 +5311,19 @@ void POA_CORBA_StructDef::_get_members_skel (
   TAO_ServerRequestInfo_CORBA_StructDef_members_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -5431,20 +5332,20 @@ void POA_CORBA_StructDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5466,16 +5367,13 @@ void POA_CORBA_StructDef::_get_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_StructDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -5503,39 +5401,39 @@ void POA_CORBA_StructDef::_set_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -5550,16 +5448,13 @@ void POA_CORBA_StructDef::_set_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_StructDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -5569,7 +5464,7 @@ void POA_CORBA_StructDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -5581,12 +5476,12 @@ void POA_CORBA_StructDef::_is_a_skel (
 void POA_CORBA_StructDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -5598,8 +5493,8 @@ void POA_CORBA_StructDef::_non_existent_skel (
 void POA_CORBA_StructDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StructDef *_tao_impl = (POA_CORBA_StructDef *) _tao_object_reference;
@@ -5618,7 +5513,7 @@ void POA_CORBA_StructDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -5644,11 +5539,11 @@ void POA_CORBA_StructDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_StructDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -5685,12 +5580,12 @@ void* POA_CORBA_StructDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_StructDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -5700,9 +5595,9 @@ const char* POA_CORBA_StructDef::_interface_repository_id (void) const
 }
 
 CORBA_StructDef*
-POA_CORBA_StructDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_StructDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -5892,36 +5787,32 @@ public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -5938,45 +5829,45 @@ private:
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_UnionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_UnionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5988,7 +5879,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::result (CORBA::Envi
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5997,11 +5888,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_most_derived
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6017,36 +5908,32 @@ public:
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -6063,45 +5950,45 @@ private:
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_UnionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_UnionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6113,7 +6000,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::result (CORBA::
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6122,11 +6009,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_most_der
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6143,36 +6030,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
     ,
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -6190,8 +6073,8 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_UnionDef *tao_impl,
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6199,12 +6082,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::TAO_ServerReque
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6220,25 +6103,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::arguments (CORB
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -6246,7 +6129,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::result (CORBA::
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6255,11 +6138,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_most_der
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_UnionDef_members_get : public TAO_ServerRequestInfo
@@ -6268,36 +6151,32 @@ public:
   TAO_ServerRequestInfo_CORBA_UnionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_UnionMemberSeq * result);
@@ -6314,45 +6193,45 @@ private:
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::TAO_ServerRequestInfo_CORBA_UnionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_UnionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_UnionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6364,7 +6243,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6373,11 +6252,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6394,36 +6273,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_UnionDef *tao_impl
     ,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -6441,8 +6316,8 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_UnionDef *tao_impl,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6450,12 +6325,12 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::TAO_ServerRequestInfo_CORBA_Un
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6471,25 +6346,25 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -6497,7 +6372,7 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6506,11 +6381,11 @@ TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_UnionDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -6542,18 +6417,18 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::~_TAO_CORBA_UnionDef_Strategized_P
 
 _TAO_CORBA_UnionDef_Proxy_Impl&
 _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_UnionDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_UnionDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -6562,8 +6437,8 @@ _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_UnionDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -6632,8 +6507,8 @@ _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6648,8 +6523,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "discriminator_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6658,13 +6533,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6679,8 +6554,8 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "discriminator_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6689,14 +6564,14 @@ CORBA_IDLType_ptr _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6709,8 +6584,8 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "discriminator_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6719,15 +6594,15 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::discriminator_type_def (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->discriminator_type_def (
-        discriminator_type_def,
-        ACE_TRY_ENV
+        discriminator_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6742,8 +6617,8 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6752,14 +6627,14 @@ CORBA_UnionMemberSeq * _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6772,8 +6647,8 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6782,8 +6657,8 @@ void _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/UnionDef:1.0"
         )
     )->members (
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -6816,8 +6691,8 @@ POA_CORBA_UnionDef::~POA_CORBA_UnionDef (void)
 void POA_CORBA_UnionDef::_get_discriminator_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl =
@@ -6837,19 +6712,19 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->discriminator_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6858,20 +6733,20 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6893,16 +6768,13 @@ void POA_CORBA_UnionDef::_get_discriminator_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl =
@@ -6922,19 +6794,19 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
   TAO_ServerRequestInfo_CORBA_UnionDef_discriminator_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->discriminator_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6943,20 +6815,20 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6978,16 +6850,13 @@ void POA_CORBA_UnionDef::_get_discriminator_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7015,39 +6884,39 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      discriminator_type_def.in (),
-      ACE_TRY_ENV
+      discriminator_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->discriminator_type_def (
-          discriminator_type_def.in (),
-          ACE_TRY_ENV
+          discriminator_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7062,16 +6931,13 @@ void POA_CORBA_UnionDef::_set_discriminator_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl =
@@ -7091,19 +6957,19 @@ void POA_CORBA_UnionDef::_get_members_skel (
   TAO_ServerRequestInfo_CORBA_UnionDef_members_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7112,20 +6978,20 @@ void POA_CORBA_UnionDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7147,16 +7013,13 @@ void POA_CORBA_UnionDef::_get_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7184,39 +7047,39 @@ void POA_CORBA_UnionDef::_set_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7231,16 +7094,13 @@ void POA_CORBA_UnionDef::_set_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_UnionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7250,7 +7110,7 @@ void POA_CORBA_UnionDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -7262,12 +7122,12 @@ void POA_CORBA_UnionDef::_is_a_skel (
 void POA_CORBA_UnionDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -7279,8 +7139,8 @@ void POA_CORBA_UnionDef::_non_existent_skel (
 void POA_CORBA_UnionDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_UnionDef *_tao_impl = (POA_CORBA_UnionDef *) _tao_object_reference;
@@ -7299,7 +7159,7 @@ void POA_CORBA_UnionDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -7325,11 +7185,11 @@ void POA_CORBA_UnionDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_UnionDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -7366,12 +7226,12 @@ void* POA_CORBA_UnionDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_UnionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -7381,9 +7241,9 @@ const char* POA_CORBA_UnionDef::_interface_repository_id (void) const
 }
 
 CORBA_UnionDef*
-POA_CORBA_UnionDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_UnionDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -7551,36 +7411,32 @@ public:
   TAO_ServerRequestInfo_CORBA_EnumDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_EnumMemberSeq * result);
@@ -7597,45 +7453,45 @@ private:
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::TAO_ServerRequestInfo_CORBA_EnumDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_EnumDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_EnumDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7647,7 +7503,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -7656,11 +7512,11 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_EnumDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -7677,36 +7533,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_EnumDef *tao_impl
     ,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -7724,8 +7576,8 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_EnumDef *tao_impl,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -7733,12 +7585,12 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::TAO_ServerRequestInfo_CORBA_Enu
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7754,25 +7606,25 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -7780,7 +7632,7 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -7789,11 +7641,11 @@ TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_EnumDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -7825,18 +7677,18 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::~_TAO_CORBA_EnumDef_Strategized_Pro
 
 _TAO_CORBA_EnumDef_Proxy_Impl&
 _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_EnumDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_EnumDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -7845,8 +7697,8 @@ _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_EnumDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -7915,8 +7767,8 @@ _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (vo
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7931,8 +7783,8 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7941,14 +7793,14 @@ CORBA_EnumMemberSeq * _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7961,8 +7813,8 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -7971,8 +7823,8 @@ void _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/EnumDef:1.0"
         )
     )->members (
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -8004,8 +7856,8 @@ POA_CORBA_EnumDef::~POA_CORBA_EnumDef (void)
 void POA_CORBA_EnumDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_EnumDef *_tao_impl =
@@ -8025,19 +7877,19 @@ void POA_CORBA_EnumDef::_get_members_skel (
   TAO_ServerRequestInfo_CORBA_EnumDef_members_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8046,20 +7898,20 @@ void POA_CORBA_EnumDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8081,16 +7933,13 @@ void POA_CORBA_EnumDef::_get_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_EnumDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8118,39 +7967,39 @@ void POA_CORBA_EnumDef::_set_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8165,16 +8014,13 @@ void POA_CORBA_EnumDef::_set_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_EnumDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8184,7 +8030,7 @@ void POA_CORBA_EnumDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8196,12 +8042,12 @@ void POA_CORBA_EnumDef::_is_a_skel (
 void POA_CORBA_EnumDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8213,8 +8059,8 @@ void POA_CORBA_EnumDef::_non_existent_skel (
 void POA_CORBA_EnumDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_EnumDef *_tao_impl = (POA_CORBA_EnumDef *) _tao_object_reference;
@@ -8233,7 +8079,7 @@ void POA_CORBA_EnumDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -8259,11 +8105,11 @@ void POA_CORBA_EnumDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_EnumDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -8297,12 +8143,12 @@ void* POA_CORBA_EnumDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_EnumDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -8312,9 +8158,9 @@ const char* POA_CORBA_EnumDef::_interface_repository_id (void) const
 }
 
 CORBA_EnumDef*
-POA_CORBA_EnumDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_EnumDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -8482,36 +8328,32 @@ public:
   TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -8528,45 +8370,45 @@ private:
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_AliasDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_AliasDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -8578,7 +8420,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::result (CORBA::Envir
 
 char *
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8587,11 +8429,11 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_most_derived_
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -8608,36 +8450,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AliasDef *tao_impl
     ,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -8655,8 +8493,8 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AliasDef *tao_impl,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -8664,12 +8502,12 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::TAO_ServerRequestInf
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -8685,25 +8523,25 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::arguments (CORBA::En
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -8711,7 +8549,7 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::result (CORBA::Envir
 
 char *
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8720,11 +8558,11 @@ TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_most_derived_
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8756,18 +8594,18 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::~_TAO_CORBA_AliasDef_Strategized_P
 
 _TAO_CORBA_AliasDef_Proxy_Impl&
 _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_AliasDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_AliasDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -8776,8 +8614,8 @@ _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_AliasDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -8846,8 +8684,8 @@ _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8862,8 +8700,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -8872,14 +8710,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8892,8 +8730,8 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -8902,8 +8740,8 @@ void _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/AliasDef:1.0"
         )
     )->original_type_def (
-        original_type_def,
-        ACE_TRY_ENV
+        original_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -8935,8 +8773,8 @@ POA_CORBA_AliasDef::~POA_CORBA_AliasDef (void)
 void POA_CORBA_AliasDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AliasDef *_tao_impl =
@@ -8956,19 +8794,19 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
   TAO_ServerRequestInfo_CORBA_AliasDef_original_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->original_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8977,20 +8815,20 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9012,16 +8850,13 @@ void POA_CORBA_AliasDef::_get_original_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AliasDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9049,39 +8884,39 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      original_type_def.in (),
-      ACE_TRY_ENV
+      original_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->original_type_def (
-          original_type_def.in (),
-          ACE_TRY_ENV
+          original_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9096,16 +8931,13 @@ void POA_CORBA_AliasDef::_set_original_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AliasDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9115,7 +8947,7 @@ void POA_CORBA_AliasDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9127,12 +8959,12 @@ void POA_CORBA_AliasDef::_is_a_skel (
 void POA_CORBA_AliasDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9144,8 +8976,8 @@ void POA_CORBA_AliasDef::_non_existent_skel (
 void POA_CORBA_AliasDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AliasDef *_tao_impl = (POA_CORBA_AliasDef *) _tao_object_reference;
@@ -9164,7 +8996,7 @@ void POA_CORBA_AliasDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9190,11 +9022,11 @@ void POA_CORBA_AliasDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_AliasDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9228,12 +9060,12 @@ void* POA_CORBA_AliasDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_AliasDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9243,9 +9075,9 @@ const char* POA_CORBA_AliasDef::_interface_repository_id (void) const
 }
 
 CORBA_AliasDef*
-POA_CORBA_AliasDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_AliasDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9434,18 +9266,18 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::~_TAO_CORBA_NativeDef_Strategized
 
 _TAO_CORBA_NativeDef_Proxy_Impl&
 _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_NativeDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_NativeDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9454,8 +9286,8 @@ _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_NativeDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9550,8 +9382,8 @@ POA_CORBA_NativeDef::~POA_CORBA_NativeDef (void)
 void POA_CORBA_NativeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9561,7 +9393,7 @@ void POA_CORBA_NativeDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9573,12 +9405,12 @@ void POA_CORBA_NativeDef::_is_a_skel (
 void POA_CORBA_NativeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9590,8 +9422,8 @@ void POA_CORBA_NativeDef::_non_existent_skel (
 void POA_CORBA_NativeDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_NativeDef *_tao_impl = (POA_CORBA_NativeDef *) _tao_object_reference;
@@ -9610,7 +9442,7 @@ void POA_CORBA_NativeDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9636,11 +9468,11 @@ void POA_CORBA_NativeDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_NativeDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9674,12 +9506,12 @@ void* POA_CORBA_NativeDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_NativeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9689,9 +9521,9 @@ const char* POA_CORBA_NativeDef::_interface_repository_id (void) const
 }
 
 CORBA_NativeDef*
-POA_CORBA_NativeDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_NativeDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9827,36 +9659,32 @@ public:
   TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_PrimitiveDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::PrimitiveKind result);
@@ -9873,45 +9701,45 @@ private:
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_PrimitiveDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_PrimitiveDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9923,7 +9751,7 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9932,11 +9760,11 @@ TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9975,18 +9803,18 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::~_TAO_CORBA_PrimitiveDef_Strat
 
 _TAO_CORBA_PrimitiveDef_Proxy_Impl&
 _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_PrimitiveDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_PrimitiveDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9995,8 +9823,8 @@ _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10065,8 +9893,8 @@ _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::_TAO_CORBA_PrimitiveDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10081,8 +9909,8 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "kind",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -10091,7 +9919,7 @@ CORBA::PrimitiveKind _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl::kind (
           "IDL:omg.org/CORBA/PrimitiveDef:1.0"
         )
     )->kind (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -10120,8 +9948,8 @@ POA_CORBA_PrimitiveDef::~POA_CORBA_PrimitiveDef (void)
 void POA_CORBA_PrimitiveDef::_get_kind_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_PrimitiveDef *_tao_impl =
@@ -10141,19 +9969,19 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
   TAO_ServerRequestInfo_CORBA_PrimitiveDef_kind_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->kind (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -10161,20 +9989,20 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
       CORBA::PrimitiveKind _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10196,16 +10024,13 @@ void POA_CORBA_PrimitiveDef::_get_kind_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_PrimitiveDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10215,7 +10040,7 @@ void POA_CORBA_PrimitiveDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10227,12 +10052,12 @@ void POA_CORBA_PrimitiveDef::_is_a_skel (
 void POA_CORBA_PrimitiveDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10244,8 +10069,8 @@ void POA_CORBA_PrimitiveDef::_non_existent_skel (
 void POA_CORBA_PrimitiveDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_PrimitiveDef *_tao_impl = (POA_CORBA_PrimitiveDef *) _tao_object_reference;
@@ -10264,7 +10089,7 @@ void POA_CORBA_PrimitiveDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10290,11 +10115,11 @@ void POA_CORBA_PrimitiveDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_PrimitiveDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10322,12 +10147,12 @@ void* POA_CORBA_PrimitiveDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_PrimitiveDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10337,9 +10162,9 @@ const char* POA_CORBA_PrimitiveDef::_interface_repository_id (void) const
 }
 
 CORBA_PrimitiveDef*
-POA_CORBA_PrimitiveDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_PrimitiveDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10495,36 +10320,32 @@ public:
   TAO_ServerRequestInfo_CORBA_StringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -10541,45 +10362,45 @@ private:
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::TAO_ServerRequestInfo_CORBA_StringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_StringDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_StringDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -10591,7 +10412,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -10600,11 +10421,11 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StringDef_bound_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -10621,36 +10442,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_StringDef *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -10668,8 +10485,8 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_StringDef *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -10677,12 +10494,12 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::TAO_ServerRequestInfo_CORBA_Str
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -10698,25 +10515,25 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -10724,7 +10541,7 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -10733,11 +10550,11 @@ TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_StringDef_bound_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -10769,18 +10586,18 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::~_TAO_CORBA_StringDef_Strategized
 
 _TAO_CORBA_StringDef_Proxy_Impl&
 _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_StringDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_StringDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10789,8 +10606,8 @@ _TAO_CORBA_StringDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_StringDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10859,8 +10676,8 @@ _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10875,8 +10692,8 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -10885,14 +10702,14 @@ CORBA::ULong _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -10905,8 +10722,8 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -10915,8 +10732,8 @@ void _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/StringDef:1.0"
         )
     )->bound (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -10946,8 +10763,8 @@ POA_CORBA_StringDef::~POA_CORBA_StringDef (void)
 void POA_CORBA_StringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StringDef *_tao_impl =
@@ -10967,19 +10784,19 @@ void POA_CORBA_StringDef::_get_bound_skel (
   TAO_ServerRequestInfo_CORBA_StringDef_bound_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->bound (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -10987,20 +10804,20 @@ void POA_CORBA_StringDef::_get_bound_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11022,16 +10839,13 @@ void POA_CORBA_StringDef::_get_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_StringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11059,39 +10873,39 @@ void POA_CORBA_StringDef::_set_bound_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->bound (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11106,16 +10920,13 @@ void POA_CORBA_StringDef::_set_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_StringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11125,7 +10936,7 @@ void POA_CORBA_StringDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11137,12 +10948,12 @@ void POA_CORBA_StringDef::_is_a_skel (
 void POA_CORBA_StringDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11154,8 +10965,8 @@ void POA_CORBA_StringDef::_non_existent_skel (
 void POA_CORBA_StringDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_StringDef *_tao_impl = (POA_CORBA_StringDef *) _tao_object_reference;
@@ -11174,7 +10985,7 @@ void POA_CORBA_StringDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -11200,11 +11011,11 @@ void POA_CORBA_StringDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_StringDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -11232,12 +11043,12 @@ void* POA_CORBA_StringDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_StringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -11247,9 +11058,9 @@ const char* POA_CORBA_StringDef::_interface_repository_id (void) const
 }
 
 CORBA_StringDef*
-POA_CORBA_StringDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_StringDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -11405,36 +11216,32 @@ public:
   TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -11451,45 +11258,45 @@ private:
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::TAO_ServerRequestInfo_CORBA_WstringDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_WstringDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_WstringDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11501,7 +11308,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11510,11 +11317,11 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11531,36 +11338,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_WstringDef *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -11578,8 +11381,8 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_WstringDef *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -11587,12 +11390,12 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::TAO_ServerRequestInfo_CORBA_Ws
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -11608,25 +11411,25 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -11634,7 +11437,7 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11643,11 +11446,11 @@ TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_WstringDef_bound_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -11679,18 +11482,18 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::~_TAO_CORBA_WstringDef_Strategiz
 
 _TAO_CORBA_WstringDef_Proxy_Impl&
 _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_WstringDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_WstringDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -11699,8 +11502,8 @@ _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_WstringDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -11769,8 +11572,8 @@ _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::_TAO_CORBA_WstringDef_ThruPOA_Proxy_Im
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11785,8 +11588,8 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -11795,14 +11598,14 @@ CORBA::ULong _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -11815,8 +11618,8 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -11825,8 +11628,8 @@ void _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/WstringDef:1.0"
         )
     )->bound (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -11856,8 +11659,8 @@ POA_CORBA_WstringDef::~POA_CORBA_WstringDef (void)
 void POA_CORBA_WstringDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_WstringDef *_tao_impl =
@@ -11877,19 +11680,19 @@ void POA_CORBA_WstringDef::_get_bound_skel (
   TAO_ServerRequestInfo_CORBA_WstringDef_bound_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->bound (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -11897,20 +11700,20 @@ void POA_CORBA_WstringDef::_get_bound_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -11932,16 +11735,13 @@ void POA_CORBA_WstringDef::_get_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_WstringDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11969,39 +11769,39 @@ void POA_CORBA_WstringDef::_set_bound_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->bound (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -12016,16 +11816,13 @@ void POA_CORBA_WstringDef::_set_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_WstringDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -12035,7 +11832,7 @@ void POA_CORBA_WstringDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -12047,12 +11844,12 @@ void POA_CORBA_WstringDef::_is_a_skel (
 void POA_CORBA_WstringDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -12064,8 +11861,8 @@ void POA_CORBA_WstringDef::_non_existent_skel (
 void POA_CORBA_WstringDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_WstringDef *_tao_impl = (POA_CORBA_WstringDef *) _tao_object_reference;
@@ -12084,7 +11881,7 @@ void POA_CORBA_WstringDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -12110,11 +11907,11 @@ void POA_CORBA_WstringDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_WstringDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -12142,12 +11939,12 @@ void* POA_CORBA_WstringDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_WstringDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -12157,9 +11954,9 @@ const char* POA_CORBA_WstringDef::_interface_repository_id (void) const
 }
 
 CORBA_WstringDef*
-POA_CORBA_WstringDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_WstringDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -12259,22 +12056,22 @@ TAO_CORBA_SequenceDef_Perfect_Hash_OpTable::lookup (const char *str, unsigned in
     {
       {"",0},{"",0},{"",0},{"",0},{"",0},
       {"_is_a",  &POA_CORBA_SequenceDef::_is_a_skel},
-      {"destroy", 	&POA_CORBA_SequenceDef::destroy_skel},
-      {"_get_bound", 	&POA_CORBA_SequenceDef::_get_bound_skel},
-      {"_set_bound", 	&POA_CORBA_SequenceDef::_set_bound_skel},
-      {"_get_def_kind", 	&POA_CORBA_SequenceDef::_get_def_kind_skel},
-      {"_get_type", 	&POA_CORBA_SequenceDef::_get_type_skel},
+      {"destroy",       &POA_CORBA_SequenceDef::destroy_skel},
+      {"_get_bound",    &POA_CORBA_SequenceDef::_get_bound_skel},
+      {"_set_bound",    &POA_CORBA_SequenceDef::_set_bound_skel},
+      {"_get_def_kind",         &POA_CORBA_SequenceDef::_get_def_kind_skel},
+      {"_get_type",     &POA_CORBA_SequenceDef::_get_type_skel},
       {"_interface",  &POA_CORBA_SequenceDef::_interface_skel},
       {"_non_existent",  &POA_CORBA_SequenceDef::_non_existent_skel},
-      {"_get_element_type_def", 	&POA_CORBA_SequenceDef::_get_element_type_def_skel},
-      {"_set_element_type_def", 	&POA_CORBA_SequenceDef::_set_element_type_def_skel},
-      {"_get_element_type", 	&POA_CORBA_SequenceDef::_get_element_type_skel},
+      {"_get_element_type_def",         &POA_CORBA_SequenceDef::_get_element_type_def_skel},
+      {"_set_element_type_def",         &POA_CORBA_SequenceDef::_set_element_type_def_skel},
+      {"_get_element_type",     &POA_CORBA_SequenceDef::_get_element_type_skel},
     };
 
   static const signed char lookup[] =
     {
-       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -24,  -1,  -1,   9, 
-       10,  11,  -1,  -1,  12, -13,  -2, -24,  15, 
+       -1,  -1,  -1,  -1,  -1,   5,  -1,   6,  -7,  -2, -24,  -1,  -1,   9,
+       10,  11,  -1,  -1,  12, -13,  -2, -24,  15,
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
@@ -12318,36 +12115,32 @@ public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -12364,45 +12157,45 @@ private:
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_SequenceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_SequenceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12414,7 +12207,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12423,11 +12216,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12444,36 +12237,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
     ,
-    const CORBA::ULong & bound,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -12491,8 +12280,8 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_SequenceDef *tao_impl,
-    const CORBA::ULong & bound,
-    CORBA::Environment &
+    const CORBA::ULong & bound
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12500,12 +12289,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::TAO_ServerRequestInfo_CORBA_S
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12521,25 +12310,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -12547,7 +12336,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12556,11 +12345,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_bound_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get : public TAO_ServerRequestInfo
@@ -12569,36 +12358,32 @@ public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -12615,45 +12400,45 @@ private:
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_SequenceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_SequenceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12665,7 +12450,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::result (CORBA::Environ
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12674,11 +12459,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_most_derived_in
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12694,36 +12479,32 @@ public:
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -12740,45 +12521,45 @@ private:
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_SequenceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_SequenceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12790,7 +12571,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12799,11 +12580,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12820,36 +12601,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_SequenceDef *tao_impl
     ,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -12867,8 +12644,8 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_SequenceDef *tao_impl,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12876,12 +12653,12 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::TAO_ServerRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12897,25 +12674,25 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::arguments (CORBA::
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -12923,7 +12700,7 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12932,11 +12709,11 @@ TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -12968,18 +12745,18 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::~_TAO_CORBA_SequenceDef_Strateg
 
 _TAO_CORBA_SequenceDef_Proxy_Impl&
 _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_SequenceDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_SequenceDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -12988,8 +12765,8 @@ _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -13058,8 +12835,8 @@ _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_SequenceDef_ThruPOA_Proxy_
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13074,8 +12851,8 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -13084,14 +12861,14 @@ CORBA::ULong _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13104,8 +12881,8 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "bound",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -13114,15 +12891,15 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::bound (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->bound (
-        bound,
-        ACE_TRY_ENV
+        bound
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13137,8 +12914,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -13147,13 +12924,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13168,8 +12945,8 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -13178,14 +12955,14 @@ CORBA_IDLType_ptr _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -13198,8 +12975,8 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -13208,8 +12985,8 @@ void _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/SequenceDef:1.0"
         )
     )->element_type_def (
-        element_type_def,
-        ACE_TRY_ENV
+        element_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -13239,8 +13016,8 @@ POA_CORBA_SequenceDef::~POA_CORBA_SequenceDef (void)
 void POA_CORBA_SequenceDef::_get_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl =
@@ -13260,19 +13037,19 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
   TAO_ServerRequestInfo_CORBA_SequenceDef_bound_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->bound (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13280,20 +13057,20 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13315,16 +13092,13 @@ void POA_CORBA_SequenceDef::_get_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_set_bound_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13352,39 +13126,39 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      bound,
-      ACE_TRY_ENV
+      bound
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->bound (
-          bound,
-          ACE_TRY_ENV
+          bound
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13399,16 +13173,13 @@ void POA_CORBA_SequenceDef::_set_bound_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl =
@@ -13428,19 +13199,19 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13449,20 +13220,20 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13484,16 +13255,13 @@ void POA_CORBA_SequenceDef::_get_element_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl =
@@ -13513,19 +13281,19 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
   TAO_ServerRequestInfo_CORBA_SequenceDef_element_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13534,20 +13302,20 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13569,16 +13337,13 @@ void POA_CORBA_SequenceDef::_get_element_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13606,39 +13371,39 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      element_type_def.in (),
-      ACE_TRY_ENV
+      element_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->element_type_def (
-          element_type_def.in (),
-          ACE_TRY_ENV
+          element_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13653,16 +13418,13 @@ void POA_CORBA_SequenceDef::_set_element_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_SequenceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13672,7 +13434,7 @@ void POA_CORBA_SequenceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13684,12 +13446,12 @@ void POA_CORBA_SequenceDef::_is_a_skel (
 void POA_CORBA_SequenceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13701,8 +13463,8 @@ void POA_CORBA_SequenceDef::_non_existent_skel (
 void POA_CORBA_SequenceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_SequenceDef *_tao_impl = (POA_CORBA_SequenceDef *) _tao_object_reference;
@@ -13721,7 +13483,7 @@ void POA_CORBA_SequenceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -13747,11 +13509,11 @@ void POA_CORBA_SequenceDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_SequenceDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -13779,12 +13541,12 @@ void* POA_CORBA_SequenceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_SequenceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -13794,9 +13556,9 @@ const char* POA_CORBA_SequenceDef::_interface_repository_id (void) const
 }
 
 CORBA_SequenceDef*
-POA_CORBA_SequenceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_SequenceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -13955,36 +13717,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::ULong result);
@@ -14001,45 +13759,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::TAO_ServerRequestInfo_CORBA_ArrayDef_length_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ArrayDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ArrayDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14051,7 +13809,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14060,11 +13818,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -14081,36 +13839,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
     ,
-    const CORBA::ULong & length,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::ULong & length
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -14128,8 +13882,8 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ArrayDef *tao_impl,
-    const CORBA::ULong & length,
-    CORBA::Environment &
+    const CORBA::ULong & length
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -14137,12 +13891,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::TAO_ServerRequestInfo_CORBA_Arr
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -14158,25 +13912,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -14184,7 +13938,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14193,11 +13947,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_length_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get : public TAO_ServerRequestInfo
@@ -14206,36 +13960,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -14252,45 +14002,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ArrayDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ArrayDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14302,7 +14052,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14311,11 +14061,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -14331,36 +14081,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -14377,45 +14123,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ArrayDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ArrayDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -14427,7 +14173,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14436,11 +14182,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -14457,36 +14203,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ArrayDef *tao_impl
     ,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -14504,8 +14246,8 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ArrayDef *tao_impl,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -14513,12 +14255,12 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::TAO_ServerRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -14534,25 +14276,25 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::arguments (CORBA::Env
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -14560,7 +14302,7 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -14569,11 +14311,11 @@ TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -14605,18 +14347,18 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::~_TAO_CORBA_ArrayDef_Strategized_P
 
 _TAO_CORBA_ArrayDef_Proxy_Impl&
 _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ArrayDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ArrayDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -14625,8 +14367,8 @@ _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -14695,8 +14437,8 @@ _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14711,8 +14453,8 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "length",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -14721,14 +14463,14 @@ CORBA::ULong _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::ULong length,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong length
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14741,8 +14483,8 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "length",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -14751,15 +14493,15 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::length (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->length (
-        length,
-        ACE_TRY_ENV
+        length
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14774,8 +14516,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -14784,13 +14526,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14805,8 +14547,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -14815,14 +14557,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -14835,8 +14577,8 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "element_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -14845,8 +14587,8 @@ void _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl::element_type_def (
           "IDL:omg.org/CORBA/ArrayDef:1.0"
         )
     )->element_type_def (
-        element_type_def,
-        ACE_TRY_ENV
+        element_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -14876,8 +14618,8 @@ POA_CORBA_ArrayDef::~POA_CORBA_ArrayDef (void)
 void POA_CORBA_ArrayDef::_get_length_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl =
@@ -14897,19 +14639,19 @@ void POA_CORBA_ArrayDef::_get_length_skel (
   TAO_ServerRequestInfo_CORBA_ArrayDef_length_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->length (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -14917,20 +14659,20 @@ void POA_CORBA_ArrayDef::_get_length_skel (
       CORBA::ULong _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -14952,16 +14694,13 @@ void POA_CORBA_ArrayDef::_get_length_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_set_length_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -14989,39 +14728,39 @@ void POA_CORBA_ArrayDef::_set_length_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      length,
-      ACE_TRY_ENV
+      length
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->length (
-          length,
-          ACE_TRY_ENV
+          length
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -15036,16 +14775,13 @@ void POA_CORBA_ArrayDef::_set_length_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_get_element_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl =
@@ -15065,19 +14801,19 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -15086,20 +14822,20 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -15121,16 +14857,13 @@ void POA_CORBA_ArrayDef::_get_element_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_get_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl =
@@ -15150,19 +14883,19 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
   TAO_ServerRequestInfo_CORBA_ArrayDef_element_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->element_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -15171,20 +14904,20 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -15206,16 +14939,13 @@ void POA_CORBA_ArrayDef::_get_element_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_set_element_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -15243,39 +14973,39 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      element_type_def.in (),
-      ACE_TRY_ENV
+      element_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->element_type_def (
-          element_type_def.in (),
-          ACE_TRY_ENV
+          element_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -15290,16 +15020,13 @@ void POA_CORBA_ArrayDef::_set_element_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ArrayDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -15309,7 +15036,7 @@ void POA_CORBA_ArrayDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -15321,12 +15048,12 @@ void POA_CORBA_ArrayDef::_is_a_skel (
 void POA_CORBA_ArrayDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -15338,8 +15065,8 @@ void POA_CORBA_ArrayDef::_non_existent_skel (
 void POA_CORBA_ArrayDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ArrayDef *_tao_impl = (POA_CORBA_ArrayDef *) _tao_object_reference;
@@ -15358,7 +15085,7 @@ void POA_CORBA_ArrayDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -15384,11 +15111,11 @@ void POA_CORBA_ArrayDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ArrayDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -15416,12 +15143,12 @@ void* POA_CORBA_ArrayDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ArrayDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -15431,9 +15158,9 @@ const char* POA_CORBA_ArrayDef::_interface_repository_id (void) const
 }
 
 CORBA_ArrayDef*
-POA_CORBA_ArrayDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ArrayDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -15620,36 +15347,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -15666,45 +15389,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ExceptionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ExceptionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -15716,7 +15439,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -15725,11 +15448,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -15745,36 +15468,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_StructMemberSeq * result);
@@ -15791,45 +15510,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ExceptionDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ExceptionDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -15841,7 +15560,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -15850,11 +15569,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -15871,36 +15590,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ExceptionDef *tao_impl
     ,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -15918,8 +15633,8 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ExceptionDef *tao_impl,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -15927,12 +15642,12 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -15948,25 +15663,25 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -15974,7 +15689,7 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -15983,11 +15698,11 @@ TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ExceptionDef_members_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -16019,18 +15734,18 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::~_TAO_CORBA_ExceptionDef_Strat
 
 _TAO_CORBA_ExceptionDef_Proxy_Impl&
 _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ExceptionDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ExceptionDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -16039,8 +15754,8 @@ _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -16109,8 +15824,8 @@ _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ExceptionDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16125,8 +15840,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -16135,13 +15850,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16156,8 +15871,8 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -16166,14 +15881,14 @@ CORBA_StructMemberSeq * _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -16186,8 +15901,8 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "members",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -16196,8 +15911,8 @@ void _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl::members (
           "IDL:omg.org/CORBA/ExceptionDef:1.0"
         )
     )->members (
-        members,
-        ACE_TRY_ENV
+        members
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -16228,8 +15943,8 @@ POA_CORBA_ExceptionDef::~POA_CORBA_ExceptionDef (void)
 void POA_CORBA_ExceptionDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl =
@@ -16249,19 +15964,19 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_ExceptionDef_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -16270,20 +15985,20 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16305,16 +16020,13 @@ void POA_CORBA_ExceptionDef::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ExceptionDef::_get_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl =
@@ -16334,19 +16046,19 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
   TAO_ServerRequestInfo_CORBA_ExceptionDef_members_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->members (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -16355,20 +16067,20 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16390,16 +16102,13 @@ void POA_CORBA_ExceptionDef::_get_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ExceptionDef::_set_members_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -16427,39 +16136,39 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      members,
-      ACE_TRY_ENV
+      members
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->members (
-          members,
-          ACE_TRY_ENV
+          members
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -16474,16 +16183,13 @@ void POA_CORBA_ExceptionDef::_set_members_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ExceptionDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -16493,7 +16199,7 @@ void POA_CORBA_ExceptionDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -16505,12 +16211,12 @@ void POA_CORBA_ExceptionDef::_is_a_skel (
 void POA_CORBA_ExceptionDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -16522,8 +16228,8 @@ void POA_CORBA_ExceptionDef::_non_existent_skel (
 void POA_CORBA_ExceptionDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ExceptionDef *_tao_impl = (POA_CORBA_ExceptionDef *) _tao_object_reference;
@@ -16542,7 +16248,7 @@ void POA_CORBA_ExceptionDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -16568,11 +16274,11 @@ void POA_CORBA_ExceptionDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ExceptionDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -16603,12 +16309,12 @@ void* POA_CORBA_ExceptionDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ExceptionDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -16618,9 +16324,9 @@ const char* POA_CORBA_ExceptionDef::_interface_repository_id (void) const
 }
 
 CORBA_ExceptionDef*
-POA_CORBA_ExceptionDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ExceptionDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -16790,36 +16496,32 @@ public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -16836,45 +16538,45 @@ private:
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_AttributeDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_AttributeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -16886,7 +16588,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -16895,11 +16597,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -16915,36 +16617,32 @@ public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -16961,45 +16659,45 @@ private:
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_AttributeDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_AttributeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17011,7 +16709,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -17020,11 +16718,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -17041,36 +16739,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
     ,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -17088,8 +16782,8 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AttributeDef *tao_impl,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -17097,12 +16791,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -17118,25 +16812,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -17144,7 +16838,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -17153,11 +16847,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get : public TAO_ServerRequestInfo
@@ -17166,36 +16860,32 @@ public:
   TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::AttributeMode result);
@@ -17212,45 +16902,45 @@ private:
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_AttributeDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_AttributeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -17262,7 +16952,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -17271,11 +16961,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -17292,36 +16982,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_AttributeDef *tao_impl
     ,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -17339,8 +17025,8 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_AttributeDef *tao_impl,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -17348,12 +17034,12 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::TAO_ServerRequestInfo_CORBA_A
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -17369,25 +17055,25 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -17395,7 +17081,7 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -17404,11 +17090,11 @@ TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_AttributeDef_mode_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -17440,18 +17126,18 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::~_TAO_CORBA_AttributeDef_Strat
 
 _TAO_CORBA_AttributeDef_Proxy_Impl&
 _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_AttributeDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_AttributeDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -17460,8 +17146,8 @@ _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -17530,8 +17216,8 @@ _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::_TAO_CORBA_AttributeDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17546,8 +17232,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -17556,13 +17242,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17577,8 +17263,8 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -17587,14 +17273,14 @@ CORBA_IDLType_ptr _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17607,8 +17293,8 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -17617,15 +17303,15 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->type_def (
-        type_def,
-        ACE_TRY_ENV
+        type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17640,8 +17326,8 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "mode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -17650,14 +17336,14 @@ CORBA::AttributeMode _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -17670,8 +17356,8 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "mode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -17680,8 +17366,8 @@ void _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/AttributeDef:1.0"
         )
     )->mode (
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -17711,8 +17397,8 @@ POA_CORBA_AttributeDef::~POA_CORBA_AttributeDef (void)
 void POA_CORBA_AttributeDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl =
@@ -17732,19 +17418,19 @@ void POA_CORBA_AttributeDef::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -17753,20 +17439,20 @@ void POA_CORBA_AttributeDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17788,16 +17474,13 @@ void POA_CORBA_AttributeDef::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl =
@@ -17817,19 +17500,19 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
   TAO_ServerRequestInfo_CORBA_AttributeDef_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -17838,20 +17521,20 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17873,16 +17556,13 @@ void POA_CORBA_AttributeDef::_get_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -17910,39 +17590,39 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      type_def.in (),
-      ACE_TRY_ENV
+      type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->type_def (
-          type_def.in (),
-          ACE_TRY_ENV
+          type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -17957,16 +17637,13 @@ void POA_CORBA_AttributeDef::_set_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl =
@@ -17986,19 +17663,19 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
   TAO_ServerRequestInfo_CORBA_AttributeDef_mode_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->mode (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -18006,20 +17683,20 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
       CORBA::AttributeMode _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18041,16 +17718,13 @@ void POA_CORBA_AttributeDef::_get_mode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -18078,39 +17752,39 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->mode (
-          mode,
-          ACE_TRY_ENV
+          mode
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -18125,16 +17799,13 @@ void POA_CORBA_AttributeDef::_set_mode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_AttributeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -18144,7 +17815,7 @@ void POA_CORBA_AttributeDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -18156,12 +17827,12 @@ void POA_CORBA_AttributeDef::_is_a_skel (
 void POA_CORBA_AttributeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -18173,8 +17844,8 @@ void POA_CORBA_AttributeDef::_non_existent_skel (
 void POA_CORBA_AttributeDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AttributeDef *_tao_impl = (POA_CORBA_AttributeDef *) _tao_object_reference;
@@ -18193,7 +17864,7 @@ void POA_CORBA_AttributeDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -18219,11 +17890,11 @@ void POA_CORBA_AttributeDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_AttributeDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -18251,12 +17922,12 @@ void* POA_CORBA_AttributeDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_AttributeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -18266,9 +17937,9 @@ const char* POA_CORBA_AttributeDef::_interface_repository_id (void) const
 }
 
 CORBA_AttributeDef*
-POA_CORBA_AttributeDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_AttributeDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -18495,36 +18166,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -18541,45 +18208,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18591,7 +18258,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18600,11 +18267,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_result_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18620,36 +18287,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -18666,45 +18329,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18716,7 +18379,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18725,11 +18388,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18746,36 +18409,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -18793,8 +18452,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -18802,12 +18461,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -18823,25 +18482,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -18849,7 +18508,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18858,11 +18517,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_result_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_params_get : public TAO_ServerRequestInfo
@@ -18871,36 +18530,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_params_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ParDescriptionSeq * result);
@@ -18917,45 +18572,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::TAO_ServerRequestInfo_CORBA_OperationDef_params_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -18967,7 +18622,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -18976,11 +18631,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_params_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -18997,36 +18652,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19044,8 +18695,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19053,12 +18704,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19074,25 +18725,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19100,7 +18751,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19109,11 +18760,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_params_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_mode_get : public TAO_ServerRequestInfo
@@ -19122,36 +18773,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::OperationMode result);
@@ -19168,45 +18815,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::TAO_ServerRequestInfo_CORBA_OperationDef_mode_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -19218,7 +18865,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19227,11 +18874,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -19248,36 +18895,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    CORBA::OperationMode & mode,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::OperationMode & mode
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19295,8 +18938,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    CORBA::OperationMode & mode,
-    CORBA::Environment &
+    CORBA::OperationMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19304,12 +18947,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::TAO_ServerRequestInfo_CORBA_O
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19325,25 +18968,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19351,7 +18994,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19360,11 +19003,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_mode_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get : public TAO_ServerRequestInfo
@@ -19373,36 +19016,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ContextIdSeq * result);
@@ -19419,45 +19058,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -19469,7 +19108,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19478,11 +19117,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -19499,36 +19138,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19546,8 +19181,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19555,12 +19190,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19576,25 +19211,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19602,7 +19237,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19611,11 +19246,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_contexts_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get : public TAO_ServerRequestInfo
@@ -19624,36 +19259,32 @@ public:
   TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ExceptionDefSeq * result);
@@ -19670,45 +19301,45 @@ private:
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_OperationDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_OperationDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -19720,7 +19351,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19729,11 +19360,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -19750,36 +19381,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_OperationDef *tao_impl
     ,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -19797,8 +19424,8 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_OperationDef *tao_impl,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -19806,12 +19433,12 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -19827,25 +19454,25 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -19853,7 +19480,7 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -19862,11 +19489,11 @@ TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -19898,18 +19525,18 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::~_TAO_CORBA_OperationDef_Strat
 
 _TAO_CORBA_OperationDef_Proxy_Impl&
 _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_OperationDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_OperationDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -19918,8 +19545,8 @@ _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_OperationDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -19988,8 +19615,8 @@ _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::_TAO_CORBA_OperationDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20004,8 +19631,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "result",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20014,13 +19641,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20035,8 +19662,8 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "result_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20045,14 +19672,14 @@ CORBA_IDLType_ptr _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20065,8 +19692,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "result_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20075,15 +19702,15 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::result_def (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->result_def (
-        result_def,
-        ACE_TRY_ENV
+        result_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20098,8 +19725,8 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "params",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20108,14 +19735,14 @@ CORBA_ParDescriptionSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20128,8 +19755,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "params",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20138,15 +19765,15 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::params (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->params (
-        params,
-        ACE_TRY_ENV
+        params
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20161,8 +19788,8 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "mode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -20171,14 +19798,14 @@ CORBA::OperationMode _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::OperationMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20191,8 +19818,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "mode",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20201,15 +19828,15 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::mode (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->mode (
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20224,8 +19851,8 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "contexts",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20234,14 +19861,14 @@ CORBA_ContextIdSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20254,8 +19881,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "contexts",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20264,15 +19891,15 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::contexts (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->contexts (
-        contexts,
-        ACE_TRY_ENV
+        contexts
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20287,8 +19914,8 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "exceptions",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -20297,14 +19924,14 @@ CORBA_ExceptionDefSeq * _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -20317,8 +19944,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "exceptions",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -20327,8 +19954,8 @@ void _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl::exceptions (
           "IDL:omg.org/CORBA/OperationDef:1.0"
         )
     )->exceptions (
-        exceptions,
-        ACE_TRY_ENV
+        exceptions
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -20358,8 +19985,8 @@ POA_CORBA_OperationDef::~POA_CORBA_OperationDef (void)
 void POA_CORBA_OperationDef::_get_result_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20379,19 +20006,19 @@ void POA_CORBA_OperationDef::_get_result_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_result_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->result (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20400,20 +20027,20 @@ void POA_CORBA_OperationDef::_get_result_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20435,16 +20062,13 @@ void POA_CORBA_OperationDef::_get_result_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20464,19 +20088,19 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_result_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->result_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20485,20 +20109,20 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20520,16 +20144,13 @@ void POA_CORBA_OperationDef::_get_result_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_result_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20557,39 +20178,39 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      result_def.in (),
-      ACE_TRY_ENV
+      result_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->result_def (
-          result_def.in (),
-          ACE_TRY_ENV
+          result_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20604,16 +20225,13 @@ void POA_CORBA_OperationDef::_set_result_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_params_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20633,19 +20251,19 @@ void POA_CORBA_OperationDef::_get_params_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_params_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->params (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20654,20 +20272,20 @@ void POA_CORBA_OperationDef::_get_params_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20689,16 +20307,13 @@ void POA_CORBA_OperationDef::_get_params_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_params_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20726,39 +20341,39 @@ void POA_CORBA_OperationDef::_set_params_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      params,
-      ACE_TRY_ENV
+      params
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->params (
-          params,
-          ACE_TRY_ENV
+          params
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20773,16 +20388,13 @@ void POA_CORBA_OperationDef::_set_params_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20802,19 +20414,19 @@ void POA_CORBA_OperationDef::_get_mode_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_mode_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->mode (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20822,20 +20434,20 @@ void POA_CORBA_OperationDef::_get_mode_skel (
       CORBA::OperationMode _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20857,16 +20469,13 @@ void POA_CORBA_OperationDef::_get_mode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_mode_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -20894,39 +20503,39 @@ void POA_CORBA_OperationDef::_set_mode_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->mode (
-          mode,
-          ACE_TRY_ENV
+          mode
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -20941,16 +20550,13 @@ void POA_CORBA_OperationDef::_set_mode_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -20970,19 +20576,19 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_contexts_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->contexts (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -20991,20 +20597,20 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -21026,16 +20632,13 @@ void POA_CORBA_OperationDef::_get_contexts_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_contexts_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -21063,39 +20666,39 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      contexts,
-      ACE_TRY_ENV
+      contexts
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->contexts (
-          contexts,
-          ACE_TRY_ENV
+          contexts
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -21110,16 +20713,13 @@ void POA_CORBA_OperationDef::_set_contexts_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_get_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl =
@@ -21139,19 +20739,19 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
   TAO_ServerRequestInfo_CORBA_OperationDef_exceptions_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->exceptions (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -21160,20 +20760,20 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -21195,16 +20795,13 @@ void POA_CORBA_OperationDef::_get_exceptions_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_set_exceptions_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -21232,39 +20829,39 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      exceptions,
-      ACE_TRY_ENV
+      exceptions
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->exceptions (
-          exceptions,
-          ACE_TRY_ENV
+          exceptions
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -21279,16 +20876,13 @@ void POA_CORBA_OperationDef::_set_exceptions_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_OperationDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -21298,7 +20892,7 @@ void POA_CORBA_OperationDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -21310,12 +20904,12 @@ void POA_CORBA_OperationDef::_is_a_skel (
 void POA_CORBA_OperationDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -21327,8 +20921,8 @@ void POA_CORBA_OperationDef::_non_existent_skel (
 void POA_CORBA_OperationDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef *_tao_impl = (POA_CORBA_OperationDef *) _tao_object_reference;
@@ -21347,7 +20941,7 @@ void POA_CORBA_OperationDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -21373,11 +20967,11 @@ void POA_CORBA_OperationDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_OperationDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -21405,12 +20999,12 @@ void* POA_CORBA_OperationDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_OperationDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -21420,9 +21014,9 @@ const char* POA_CORBA_OperationDef::_interface_repository_id (void) const
 }
 
 CORBA_OperationDef*
-POA_CORBA_OperationDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_OperationDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -21614,36 +21208,32 @@ public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -21660,45 +21250,45 @@ private:
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_InterfaceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_InterfaceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21710,7 +21300,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21719,11 +21309,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -21740,36 +21330,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
     ,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -21787,8 +21373,8 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_InterfaceDef *tao_impl,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -21796,12 +21382,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::TAO_ServerRequestI
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21817,25 +21403,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::arguments (CORBA::
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -21843,7 +21429,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::result (CORBA::Env
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21852,11 +21438,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_most_derive
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a : public TAO_ServerRequestInfo
@@ -21866,36 +21452,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
     ,
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * interface_id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -21914,8 +21496,8 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_InterfaceDef *tao_impl,
-    const char * interface_id,
-    CORBA::Environment &
+    const char * interface_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -21923,12 +21505,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::TAO_ServerRequestInfo_CORBA_Inter
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -21944,25 +21526,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::arguments (CORBA::Environment &AC
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -21974,7 +21556,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::result (CORBA::Environment &ACE_T
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -21983,11 +21565,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -22003,36 +21585,32 @@ public:
   TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_InterfaceDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef::FullInterfaceDescription * result);
@@ -22049,45 +21627,45 @@ private:
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_InterfaceDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_InterfaceDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -22099,7 +21677,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::result (CORBA::Envi
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -22108,11 +21686,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_most_derived
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -22133,36 +21711,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AttributeDef_ptr result);
@@ -22189,8 +21763,8 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -22202,12 +21776,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::TAO_ServerRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -22235,25 +21809,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::arguments (CORBA::Env
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -22265,7 +21839,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -22274,11 +21848,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_attribute::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -22302,36 +21876,32 @@ public:
     CORBA::OperationMode & mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_OperationDef_ptr result);
@@ -22364,8 +21934,8 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo
     CORBA::OperationMode & mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -22380,12 +21950,12 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::TAO_ServerRequestInfo
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -22422,25 +21992,25 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::arguments (CORBA::Env
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -22452,7 +22022,7 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -22461,11 +22031,11 @@ TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_InterfaceDef_create_operation::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -22504,18 +22074,18 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_InterfaceDef_Strat
 
 _TAO_CORBA_InterfaceDef_Proxy_Impl&
 _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_InterfaceDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_InterfaceDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -22524,8 +22094,8 @@ _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -22594,8 +22164,8 @@ _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::_TAO_CORBA_InterfaceDef_ThruPOA_Prox
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22610,8 +22180,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22620,14 +22190,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfa
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22640,8 +22210,8 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -22650,16 +22220,16 @@ void _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::base_interfaces (
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->base_interfaces (
-        base_interfaces,
-        ACE_TRY_ENV
+        base_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22674,8 +22244,8 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_a",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -22684,14 +22254,14 @@ CORBA::Boolean _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::is_a (
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->is_a (
-        interface_id,
-        ACE_TRY_ENV
+        interface_id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::describe_interface (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22706,8 +22276,8 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "describe_interface",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22716,7 +22286,7 @@ CORBA_InterfaceDef::FullInterfaceDescription * _TAO_CORBA_InterfaceDef_ThruPOA_P
           "IDL:omg.org/CORBA/InterfaceDef:1.0"
         )
     )->describe_interface (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -22726,8 +22296,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22742,8 +22312,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_attribute",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22756,8 +22326,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_attrib
         name,
         version,
         type,
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -22770,8 +22340,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -22786,8 +22356,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_operation",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -22803,8 +22373,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl::create_operat
         mode,
         params,
         exceptions,
-        contexts,
-        ACE_TRY_ENV
+        contexts
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -22835,8 +22405,8 @@ POA_CORBA_InterfaceDef::~POA_CORBA_InterfaceDef (void)
 void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl =
@@ -22856,19 +22426,19 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
   TAO_ServerRequestInfo_CORBA_InterfaceDef_base_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -22877,20 +22447,20 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22912,16 +22482,13 @@ void POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -22949,39 +22516,39 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      base_interfaces,
-      ACE_TRY_ENV
+      base_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->base_interfaces (
-          base_interfaces,
-          ACE_TRY_ENV
+          base_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -22996,16 +22563,13 @@ void POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23033,20 +22597,20 @@ void POA_CORBA_InterfaceDef::is_a_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      interface_id.in (),
-      ACE_TRY_ENV
+      interface_id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
-          interface_id.in (),
-          ACE_TRY_ENV
+          interface_id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -23054,20 +22618,20 @@ void POA_CORBA_InterfaceDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23089,16 +22653,13 @@ void POA_CORBA_InterfaceDef::is_a_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::describe_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl =
@@ -23118,19 +22679,19 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
   TAO_ServerRequestInfo_CORBA_InterfaceDef_describe_interface ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->describe_interface (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -23139,20 +22700,20 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23174,16 +22735,13 @@ void POA_CORBA_InterfaceDef::describe_interface_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23223,13 +22781,13 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
       name.in (),
       version.in (),
       type.in (),
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -23239,8 +22797,8 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
           name.in (),
           version.in (),
           type.in (),
-          mode,
-          ACE_TRY_ENV
+          mode
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -23249,20 +22807,20 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23284,16 +22842,13 @@ void POA_CORBA_InterfaceDef::create_attribute_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23342,13 +22897,13 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
       mode,
       params,
       exceptions,
-      contexts,
-      ACE_TRY_ENV
+      contexts
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -23361,8 +22916,8 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
           mode,
           params,
           exceptions,
-          contexts,
-          ACE_TRY_ENV
+          contexts
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -23371,20 +22926,20 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -23406,16 +22961,13 @@ void POA_CORBA_InterfaceDef::create_operation_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_InterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23425,7 +22977,7 @@ void POA_CORBA_InterfaceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23437,12 +22989,12 @@ void POA_CORBA_InterfaceDef::_is_a_skel (
 void POA_CORBA_InterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23454,8 +23006,8 @@ void POA_CORBA_InterfaceDef::_non_existent_skel (
 void POA_CORBA_InterfaceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef *_tao_impl = (POA_CORBA_InterfaceDef *) _tao_object_reference;
@@ -23474,7 +23026,7 @@ void POA_CORBA_InterfaceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -23500,11 +23052,11 @@ void POA_CORBA_InterfaceDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_InterfaceDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -23538,12 +23090,12 @@ void* POA_CORBA_InterfaceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_InterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -23553,9 +23105,9 @@ const char* POA_CORBA_InterfaceDef::_interface_repository_id (void) const
 }
 
 CORBA_InterfaceDef*
-POA_CORBA_InterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_InterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -23770,18 +23322,18 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_AbstractIn
 
 _TAO_CORBA_AbstractInterfaceDef_Proxy_Impl&
 _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_AbstractInterfaceDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_AbstractInterfaceDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -23790,8 +23342,8 @@ _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -23887,8 +23439,8 @@ POA_CORBA_AbstractInterfaceDef::~POA_CORBA_AbstractInterfaceDef (void)
 void POA_CORBA_AbstractInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -23898,7 +23450,7 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23910,12 +23462,12 @@ void POA_CORBA_AbstractInterfaceDef::_is_a_skel (
 void POA_CORBA_AbstractInterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -23927,8 +23479,8 @@ void POA_CORBA_AbstractInterfaceDef::_non_existent_skel (
 void POA_CORBA_AbstractInterfaceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_AbstractInterfaceDef *_tao_impl = (POA_CORBA_AbstractInterfaceDef *) _tao_object_reference;
@@ -23947,7 +23499,7 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -23973,11 +23525,11 @@ void POA_CORBA_AbstractInterfaceDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_AbstractInterfaceDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -24014,12 +23566,12 @@ void* POA_CORBA_AbstractInterfaceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_AbstractInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -24029,9 +23581,9 @@ const char* POA_CORBA_AbstractInterfaceDef::_interface_repository_id (void) cons
 }
 
 CORBA_AbstractInterfaceDef*
-POA_CORBA_AbstractInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_AbstractInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -24246,18 +23798,18 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::~_TAO_CORBA_LocalInterfac
 
 _TAO_CORBA_LocalInterfaceDef_Proxy_Impl&
 _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_LocalInterfaceDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_LocalInterfaceDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -24266,8 +23818,8 @@ _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -24363,8 +23915,8 @@ POA_CORBA_LocalInterfaceDef::~POA_CORBA_LocalInterfaceDef (void)
 void POA_CORBA_LocalInterfaceDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -24374,7 +23926,7 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -24386,12 +23938,12 @@ void POA_CORBA_LocalInterfaceDef::_is_a_skel (
 void POA_CORBA_LocalInterfaceDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -24403,8 +23955,8 @@ void POA_CORBA_LocalInterfaceDef::_non_existent_skel (
 void POA_CORBA_LocalInterfaceDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_LocalInterfaceDef *_tao_impl = (POA_CORBA_LocalInterfaceDef *) _tao_object_reference;
@@ -24423,7 +23975,7 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -24449,11 +24001,11 @@ void POA_CORBA_LocalInterfaceDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_LocalInterfaceDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -24490,12 +24042,12 @@ void* POA_CORBA_LocalInterfaceDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_LocalInterfaceDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -24505,9 +24057,9 @@ const char* POA_CORBA_LocalInterfaceDef::_interface_repository_id (void) const
 }
 
 CORBA_LocalInterfaceDef*
-POA_CORBA_LocalInterfaceDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_LocalInterfaceDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
index fc3af925d03..5b95644bc38 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.h
@@ -64,10 +64,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -76,338 +75,310 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_Repository *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_Contained_ptr lookup_id (
-      const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void lookup_id_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void get_canonical_typecode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_PrimitiveDef_ptr get_primitive (
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::PrimitiveKind kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void get_primitive_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_StringDef_ptr create_string (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_string_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_WstringDef_ptr create_wstring (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_wstring_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_sequence_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_array_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_fixed_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_Repository_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_Repository_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_Repository_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_Repository_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_Repository_Proxy_Impl &select_proxy (
-    ::CORBA_Repository *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_Repository *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -415,18 +386,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_Repository_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -438,7 +409,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -446,93 +417,93 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_Repository_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_Repository_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_Repository_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_Repository_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_Repository_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_Contained_ptr lookup_id (
       CORBA_Object *_collocated_tao_target_,
-      const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * search_id
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_PrimitiveDef_ptr get_primitive (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::PrimitiveKind kind
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_StringDef_ptr create_string (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_WstringDef_ptr create_wstring (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA_Object *_collocated_tao_target_,
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA_Object *_collocated_tao_target_,
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -557,10 +528,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -569,295 +539,264 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ModuleDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ModuleDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ModuleDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl &select_proxy (
-    ::CORBA_ModuleDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ModuleDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -865,18 +804,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ModuleDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -888,7 +827,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -896,18 +835,18 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ModuleDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ModuleDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
@@ -932,10 +871,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -944,236 +882,217 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ConstantDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Any * value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void value (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ConstantDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ConstantDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl &select_proxy (
-    ::CORBA_ConstantDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ConstantDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1181,18 +1100,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ConstantDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1204,7 +1123,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1212,60 +1131,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ConstantDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ConstantDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Any * value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void value (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1290,10 +1209,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1302,334 +1220,300 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_StructDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_StructDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StructDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_StructDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_StructDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_StructDef_Proxy_Impl &select_proxy (
-    ::CORBA_StructDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_StructDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1637,18 +1521,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_StructDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1660,7 +1544,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1668,36 +1552,36 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_StructDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_StructDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_StructDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_StructMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1722,10 +1606,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1734,380 +1617,343 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_UnionDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_discriminator_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_discriminator_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void discriminator_type_def (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_discriminator_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_UnionMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void members (
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_UnionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_UnionDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_UnionDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_UnionDef_Proxy_Impl &select_proxy (
-    ::CORBA_UnionDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_UnionDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -2115,18 +1961,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_UnionDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -2138,7 +1984,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2146,61 +1992,61 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_UnionDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_UnionDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void discriminator_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_UnionMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -2225,10 +2071,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -2237,198 +2082,181 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_EnumDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_EnumMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void members (
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_EnumDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_EnumDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_EnumDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_EnumDef_Proxy_Impl &select_proxy (
-    ::CORBA_EnumDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_EnumDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -2436,18 +2264,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_EnumDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -2459,7 +2287,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2467,35 +2295,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_EnumDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_EnumDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_EnumMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -2520,10 +2348,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -2532,198 +2359,181 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_AliasDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_AliasDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AliasDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_AliasDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_AliasDef_Proxy_Impl &select_proxy (
-    ::CORBA_AliasDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_AliasDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -2731,18 +2541,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_AliasDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -2754,7 +2564,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -2762,35 +2572,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_AliasDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_AliasDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -2815,10 +2625,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -2827,167 +2636,152 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_NativeDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_NativeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_NativeDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_NativeDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_NativeDef_Proxy_Impl &select_proxy (
-    ::CORBA_NativeDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_NativeDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -2995,18 +2789,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_NativeDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3018,7 +2812,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3026,17 +2820,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_NativeDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_NativeDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
@@ -3061,10 +2855,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3073,94 +2866,89 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_PrimitiveDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::PrimitiveKind kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_kind_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_PrimitiveDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl &select_proxy (
-    ::CORBA_PrimitiveDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_PrimitiveDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -3168,18 +2956,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_PrimitiveDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3191,7 +2979,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3199,26 +2987,26 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_PrimitiveDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_PrimitiveDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::PrimitiveKind kind (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -3243,10 +3031,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3255,110 +3042,104 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_StringDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_StringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_StringDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_StringDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_StringDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_StringDef_Proxy_Impl &select_proxy (
-    ::CORBA_StringDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_StringDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -3366,18 +3147,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_StringDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3389,7 +3170,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3397,35 +3178,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_StringDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_StringDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_StringDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -3450,10 +3231,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3462,110 +3242,104 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_WstringDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_WstringDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_WstringDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_WstringDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_WstringDef_Proxy_Impl &select_proxy (
-    ::CORBA_WstringDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_WstringDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -3573,18 +3347,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_WstringDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3596,7 +3370,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3604,35 +3378,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_WstringDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_WstringDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -3657,10 +3431,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3669,156 +3442,147 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_SequenceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_bound_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_element_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_SequenceDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_SequenceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl &select_proxy (
-    ::CORBA_SequenceDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_SequenceDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -3826,18 +3590,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_SequenceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -3849,7 +3613,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -3857,60 +3621,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_SequenceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_SequenceDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::ULong bound (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void bound (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -3935,10 +3699,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -3947,156 +3710,147 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ArrayDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_length_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong length
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_length_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_element_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_element_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ArrayDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ArrayDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl &select_proxy (
-    ::CORBA_ArrayDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ArrayDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -4104,18 +3858,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ArrayDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -4127,7 +3881,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4135,60 +3889,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ArrayDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ArrayDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::ULong length (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void length (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::ULong length
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void element_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -4213,10 +3967,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -4225,341 +3978,307 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ExceptionDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_members_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ExceptionDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ExceptionDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl &select_proxy (
-    ::CORBA_ExceptionDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ExceptionDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -4567,18 +4286,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ExceptionDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -4590,7 +4309,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4598,44 +4317,44 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ExceptionDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ExceptionDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_StructMemberSeq * members (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void members (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -4660,10 +4379,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -4672,236 +4390,217 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_AttributeDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::AttributeMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void mode (
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AttributeDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_AttributeDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl &select_proxy (
-    ::CORBA_AttributeDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_AttributeDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -4909,18 +4608,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_AttributeDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -4932,7 +4631,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -4940,60 +4639,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_AttributeDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_AttributeDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::AttributeMode mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void mode (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -5018,10 +4717,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -5030,329 +4728,304 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_OperationDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_result_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_result_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_result_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ParDescriptionSeq * params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_params_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void params (
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ParDescriptionSeq & params
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_params_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_mode_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ContextIdSeq * contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_contexts_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void contexts (
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_contexts_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ExceptionDefSeq * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_exceptions_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void exceptions (
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq & exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_exceptions_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_OperationDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_OperationDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_OperationDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_OperationDef_Proxy_Impl &select_proxy (
-    ::CORBA_OperationDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_OperationDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -5360,18 +5033,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_OperationDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -5383,7 +5056,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -5391,111 +5064,111 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_OperationDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr result (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr result_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void result_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ParDescriptionSeq * params (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void params (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ParDescriptionSeq & params
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::OperationMode mode (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void mode (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ContextIdSeq * contexts (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void contexts (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ExceptionDefSeq * exceptions (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void exceptions (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ExceptionDefSeq & exceptions
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -5520,10 +5193,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -5532,97 +5204,92 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_InterfaceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_base_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_base_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void is_a_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void describe_interface_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_AttributeDef_ptr create_attribute (
@@ -5630,19 +5297,18 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_attribute_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -5653,287 +5319,255 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_operation_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_InterfaceDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_InterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl &select_proxy (
-    ::CORBA_InterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_InterfaceDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -5941,18 +5575,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_InterfaceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -5964,7 +5598,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -5972,66 +5606,66 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_InterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl,
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void base_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_a (
       CORBA_Object *_collocated_tao_target_,
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * interface_id
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
@@ -6041,14 +5675,14 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -6073,10 +5707,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -6085,351 +5718,313 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_AbstractInterfaceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void _get_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void is_a_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_attribute_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_operation_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_AbstractInterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl &select_proxy (
-    ::CORBA_AbstractInterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_AbstractInterfaceDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -6437,18 +6032,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -6460,7 +6055,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -6468,17 +6063,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_AbstractInterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_AbstractInterfaceDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
@@ -6503,10 +6098,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -6515,351 +6109,313 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_LocalInterfaceDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   static void _get_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_base_interfaces_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void is_a_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_attribute_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_operation_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_LocalInterfaceDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl &select_proxy (
-    ::CORBA_LocalInterfaceDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_LocalInterfaceDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -6867,18 +6423,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -6890,7 +6446,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -6898,17 +6454,17 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_LocalInterfaceDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_LocalInterfaceDef_ThruPOA_Proxy_Impl (void) { }
-  
+
 };
 
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
index 9444278bdea..452b604e36f 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS.i
@@ -22,5130 +22,5130 @@
 ACE_INLINE void POA_CORBA_Repository::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_Repository::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_Repository_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ModuleDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ModuleDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ConstantDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ConstantDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StructDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StructDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_UnionDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_UnionDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_EnumDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_EnumDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AliasDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AliasDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_NativeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_NativeDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_PrimitiveDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_PrimitiveDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_PrimitiveDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_PrimitiveDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StringDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_StringDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StringDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_StringDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_StringDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_WstringDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_WstringDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_WstringDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_WstringDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_SequenceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_SequenceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_SequenceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_SequenceDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ArrayDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ArrayDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ArrayDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ArrayDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ExceptionDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ExceptionDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AttributeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AttributeDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_OperationDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_OperationDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_InterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_InterfaceDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_AbstractInterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_AbstractInterfaceDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_LocalInterfaceDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_LocalInterfaceDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
index 8beacb70c71..84a6f1f22d9 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.h
@@ -52,7 +52,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_Repository_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -64,214 +64,194 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_Contained_ptr lookup_id (
-      const char * search_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr get_canonical_typecode (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_PrimitiveDef_ptr get_primitive (
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::PrimitiveKind kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StringDef_ptr create_string (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_WstringDef_ptr create_wstring (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -282,94 +262,86 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_Repository_tie (const POA_CORBA_Repository_tie &);
   void operator= (const POA_CORBA_Repository_tie &);
@@ -390,7 +362,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ModuleDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -402,139 +374,127 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -545,188 +505,169 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ModuleDef_tie (const POA_CORBA_ModuleDef_tie &);
   void operator= (const POA_CORBA_ModuleDef_tie &);
@@ -747,7 +688,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ConstantDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -759,169 +700,150 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Any * value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void value (
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ConstantDef_tie (const POA_CORBA_ConstantDef_tie &);
   void operator= (const POA_CORBA_ConstantDef_tie &);
@@ -942,7 +864,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_StructDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -954,156 +876,142 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -1114,196 +1022,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_StructDef_tie (const POA_CORBA_StructDef_tie &);
   void operator= (const POA_CORBA_StructDef_tie &);
@@ -1324,7 +1212,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_UnionDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -1336,181 +1224,164 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr discriminator_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr discriminator_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void discriminator_type_def (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void members (
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -1521,196 +1392,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_UnionDef_tie (const POA_CORBA_UnionDef_tie &);
   void operator= (const POA_CORBA_UnionDef_tie &);
@@ -1731,7 +1582,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_EnumDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -1743,152 +1594,135 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_EnumMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void members (
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_EnumDef_tie (const POA_CORBA_EnumDef_tie &);
   void operator= (const POA_CORBA_EnumDef_tie &);
@@ -1909,7 +1743,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_AliasDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -1921,152 +1755,135 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_AliasDef_tie (const POA_CORBA_AliasDef_tie &);
   void operator= (const POA_CORBA_AliasDef_tie &);
@@ -2087,7 +1904,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_NativeDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2099,135 +1916,120 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_NativeDef_tie (const POA_CORBA_NativeDef_tie &);
   void operator= (const POA_CORBA_NativeDef_tie &);
@@ -2248,7 +2050,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_PrimitiveDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2260,49 +2062,44 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::PrimitiveKind kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_PrimitiveDef_tie (const POA_CORBA_PrimitiveDef_tie &);
   void operator= (const POA_CORBA_PrimitiveDef_tie &);
@@ -2323,7 +2120,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_StringDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2335,58 +2132,52 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_StringDef_tie (const POA_CORBA_StringDef_tie &);
   void operator= (const POA_CORBA_StringDef_tie &);
@@ -2407,7 +2198,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_WstringDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2419,58 +2210,52 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_WstringDef_tie (const POA_CORBA_WstringDef_tie &);
   void operator= (const POA_CORBA_WstringDef_tie &);
@@ -2491,7 +2276,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_SequenceDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2503,83 +2288,74 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_SequenceDef_tie (const POA_CORBA_SequenceDef_tie &);
   void operator= (const POA_CORBA_SequenceDef_tie &);
@@ -2600,7 +2376,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ArrayDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2612,83 +2388,74 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::ULong length (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void length (
-      CORBA::ULong length,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong length
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ArrayDef_tie (const POA_CORBA_ArrayDef_tie &);
   void operator= (const POA_CORBA_ArrayDef_tie &);
@@ -2709,7 +2476,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ExceptionDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -2721,258 +2488,232 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructMemberSeq * members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void members (
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -2983,94 +2724,86 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ExceptionDef_tie (const POA_CORBA_ExceptionDef_tie &);
   void operator= (const POA_CORBA_ExceptionDef_tie &);
@@ -3091,7 +2824,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_AttributeDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -3103,169 +2836,150 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::AttributeMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void mode (
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_AttributeDef_tie (const POA_CORBA_AttributeDef_tie &);
   void operator= (const POA_CORBA_AttributeDef_tie &);
@@ -3286,7 +3000,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_OperationDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -3298,220 +3012,195 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ParDescriptionSeq * params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void params (
-      const CORBA_ParDescriptionSeq & params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ParDescriptionSeq & params
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContextIdSeq * contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void contexts (
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDefSeq * exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void exceptions (
-      const CORBA_ExceptionDefSeq & exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq & exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_OperationDef_tie (const POA_CORBA_OperationDef_tie &);
   void operator= (const POA_CORBA_OperationDef_tie &);
@@ -3532,7 +3221,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_InterfaceDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -3544,59 +3233,53 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
@@ -3605,141 +3288,129 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -3750,196 +3421,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_InterfaceDef_tie (const POA_CORBA_InterfaceDef_tie &);
   void operator= (const POA_CORBA_InterfaceDef_tie &);
@@ -3960,7 +3611,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_AbstractInterfaceDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -3972,59 +3623,53 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
@@ -4033,141 +3678,129 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -4178,196 +3811,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_AbstractInterfaceDef_tie (const POA_CORBA_AbstractInterfaceDef_tie &);
   void operator= (const POA_CORBA_AbstractInterfaceDef_tie &);
@@ -4388,7 +4001,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_LocalInterfaceDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -4400,59 +4013,53 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_InterfaceDefSeq * base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void base_interfaces (
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_a (
-      const char * interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
@@ -4461,141 +4068,129 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -4606,196 +4201,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_LocalInterfaceDef_tie (const POA_CORBA_LocalInterfaceDef_tie &);
   void operator= (const POA_CORBA_LocalInterfaceDef_tie &);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
index 9cb8f3e6fff..ca9953d37d4 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_BasicS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_Repository_tie<T>::POA_CORBA_Repository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -90,94 +90,94 @@ POA_CORBA_Repository_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_Repository_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_Repository_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_Repository::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_Repository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup_id  (
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup_id (
-search_id,
-    ACE_TRY_ENV
+search_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_Repository_tie<T>::get_canonical_typecode  (
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->get_canonical_typecode (
-tc,
-    ACE_TRY_ENV
+tc
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_PrimitiveDef_ptr POA_CORBA_Repository_tie<T>::get_primitive  (
-    CORBA::PrimitiveKind kind,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PrimitiveKind kind
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->get_primitive (
-kind,
-    ACE_TRY_ENV
+kind
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_StringDef_ptr POA_CORBA_Repository_tie<T>::create_string  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->create_string (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_WstringDef_ptr POA_CORBA_Repository_tie<T>::create_wstring  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->create_wstring (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_SequenceDef_ptr POA_CORBA_Repository_tie<T>::create_sequence  (
     CORBA::ULong bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -185,16 +185,16 @@ CORBA_SequenceDef_ptr POA_CORBA_Repository_tie<T>::create_sequence  (
 {
   return this->ptr_->create_sequence (
 bound,
-    element_type,
-    ACE_TRY_ENV
+    element_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ArrayDef_ptr POA_CORBA_Repository_tie<T>::create_array  (
     CORBA::ULong length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -202,16 +202,16 @@ CORBA_ArrayDef_ptr POA_CORBA_Repository_tie<T>::create_array  (
 {
   return this->ptr_->create_array (
 length,
-    element_type,
-    ACE_TRY_ENV
+    element_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_FixedDef_ptr POA_CORBA_Repository_tie<T>::create_fixed  (
     CORBA::UShort digits,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -219,31 +219,31 @@ CORBA_FixedDef_ptr POA_CORBA_Repository_tie<T>::create_fixed  (
 {
   return this->ptr_->create_fixed (
 digits,
-    scale,
-    ACE_TRY_ENV
+    scale
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_Repository_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -251,8 +251,8 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -261,8 +261,8 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -272,8 +272,8 @@ CORBA_ContainedSeq * POA_CORBA_Repository_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -281,8 +281,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -291,8 +291,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_Repository_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -300,8 +300,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_Repository_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -310,8 +310,8 @@ CORBA_ModuleDef_ptr POA_CORBA_Repository_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -321,8 +321,8 @@ CORBA_ConstantDef_ptr POA_CORBA_Repository_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -333,8 +333,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -343,8 +343,8 @@ CORBA_StructDef_ptr POA_CORBA_Repository_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -354,8 +354,8 @@ CORBA_StructDef_ptr POA_CORBA_Repository_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -365,8 +365,8 @@ CORBA_UnionDef_ptr POA_CORBA_Repository_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -377,8 +377,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -387,8 +387,8 @@ CORBA_EnumDef_ptr POA_CORBA_Repository_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -398,8 +398,8 @@ CORBA_EnumDef_ptr POA_CORBA_Repository_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -408,8 +408,8 @@ CORBA_AliasDef_ptr POA_CORBA_Repository_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -419,8 +419,8 @@ CORBA_AliasDef_ptr POA_CORBA_Repository_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -429,8 +429,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -440,8 +440,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -456,8 +456,8 @@ CORBA_ValueDef_ptr POA_CORBA_Repository_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -473,8 +473,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -483,8 +483,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Repository_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -494,8 +494,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_Repository_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -504,8 +504,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_Repository_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -515,8 +515,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_Repository_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -524,8 +524,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_Repository_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -534,8 +534,8 @@ CORBA_NativeDef_ptr POA_CORBA_Repository_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -544,8 +544,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_abstract_inte
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -555,8 +555,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_abstract_inte
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -565,8 +565,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -576,63 +576,63 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_Repository_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_Repository_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_Repository_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ModuleDef_tie<T>::POA_CORBA_ModuleDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -676,34 +676,34 @@ POA_CORBA_ModuleDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ModuleDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ModuleDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ModuleDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ModuleDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_ModuleDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -711,8 +711,8 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -721,8 +721,8 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -732,8 +732,8 @@ CORBA_ContainedSeq * POA_CORBA_ModuleDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -741,8 +741,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -751,8 +751,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ModuleDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -760,8 +760,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -770,8 +770,8 @@ CORBA_ModuleDef_ptr POA_CORBA_ModuleDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -781,8 +781,8 @@ CORBA_ConstantDef_ptr POA_CORBA_ModuleDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -793,8 +793,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -803,8 +803,8 @@ CORBA_StructDef_ptr POA_CORBA_ModuleDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -814,8 +814,8 @@ CORBA_StructDef_ptr POA_CORBA_ModuleDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -825,8 +825,8 @@ CORBA_UnionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -837,8 +837,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -847,8 +847,8 @@ CORBA_EnumDef_ptr POA_CORBA_ModuleDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -858,8 +858,8 @@ CORBA_EnumDef_ptr POA_CORBA_ModuleDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -868,8 +868,8 @@ CORBA_AliasDef_ptr POA_CORBA_ModuleDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -879,8 +879,8 @@ CORBA_AliasDef_ptr POA_CORBA_ModuleDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -889,8 +889,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -900,8 +900,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -916,8 +916,8 @@ CORBA_ValueDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -933,8 +933,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -943,8 +943,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -954,8 +954,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ModuleDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -964,8 +964,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -975,8 +975,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ModuleDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -984,8 +984,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -994,8 +994,8 @@ CORBA_NativeDef_ptr POA_CORBA_ModuleDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1004,8 +1004,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_abstract_inter
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1015,8 +1015,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_abstract_inter
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1025,8 +1025,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1036,144 +1036,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ModuleDef_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ModuleDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ModuleDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ModuleDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ModuleDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1181,8 +1181,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1191,63 +1191,63 @@ void POA_CORBA_ModuleDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ModuleDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ModuleDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ConstantDef_tie<T>::POA_CORBA_ConstantDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1291,216 +1291,216 @@ POA_CORBA_ConstantDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ConstantDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ConstantDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ConstantDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ConstantDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ConstantDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ConstantDef_tie<T>::type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::type_def  (
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->type_def (
-type_def,
-    ACE_TRY_ENV
+type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Any * POA_CORBA_ConstantDef_tie<T>::value  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->value (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::value  (
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->value (
-value,
-    ACE_TRY_ENV
+value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ConstantDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ConstantDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ConstantDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ConstantDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1508,8 +1508,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1518,63 +1518,63 @@ void POA_CORBA_ConstantDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ConstantDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ConstantDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StructDef_tie<T>::POA_CORBA_StructDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1618,62 +1618,62 @@ POA_CORBA_StructDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_StructDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_StructDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_StructDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_StructDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_StructMemberSeq * POA_CORBA_StructDef_tie<T>::members  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::members  (
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->members (
-members,
-    ACE_TRY_ENV
+members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_StructDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1681,8 +1681,8 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1691,8 +1691,8 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1702,8 +1702,8 @@ CORBA_ContainedSeq * POA_CORBA_StructDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1711,8 +1711,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1721,8 +1721,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_StructDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1730,8 +1730,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1740,8 +1740,8 @@ CORBA_ModuleDef_ptr POA_CORBA_StructDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1751,8 +1751,8 @@ CORBA_ConstantDef_ptr POA_CORBA_StructDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1763,8 +1763,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1773,8 +1773,8 @@ CORBA_StructDef_ptr POA_CORBA_StructDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1784,8 +1784,8 @@ CORBA_StructDef_ptr POA_CORBA_StructDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1795,8 +1795,8 @@ CORBA_UnionDef_ptr POA_CORBA_StructDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1807,8 +1807,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1817,8 +1817,8 @@ CORBA_EnumDef_ptr POA_CORBA_StructDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1828,8 +1828,8 @@ CORBA_EnumDef_ptr POA_CORBA_StructDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1838,8 +1838,8 @@ CORBA_AliasDef_ptr POA_CORBA_StructDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1849,8 +1849,8 @@ CORBA_AliasDef_ptr POA_CORBA_StructDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1859,8 +1859,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1870,8 +1870,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1886,8 +1886,8 @@ CORBA_ValueDef_ptr POA_CORBA_StructDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1903,8 +1903,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1913,8 +1913,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_StructDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1924,8 +1924,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_StructDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1934,8 +1934,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_StructDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1945,8 +1945,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_StructDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1954,8 +1954,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_StructDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1964,8 +1964,8 @@ CORBA_NativeDef_ptr POA_CORBA_StructDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1974,8 +1974,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_abstract_inter
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1985,8 +1985,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_abstract_inter
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1995,8 +1995,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2006,144 +2006,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_StructDef_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_StructDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_StructDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_StructDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_StructDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2151,8 +2151,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2161,76 +2161,76 @@ void POA_CORBA_StructDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_StructDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_StructDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StructDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_UnionDef_tie<T>::POA_CORBA_UnionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -2274,103 +2274,103 @@ POA_CORBA_UnionDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_UnionDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_UnionDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_UnionDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_UnionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_UnionDef_tie<T>::discriminator_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->discriminator_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::discriminator_type_def  (
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->discriminator_type_def (
-discriminator_type_def,
-    ACE_TRY_ENV
+discriminator_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_UnionMemberSeq * POA_CORBA_UnionDef_tie<T>::members  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::members  (
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->members (
-members,
-    ACE_TRY_ENV
+members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_UnionDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2378,8 +2378,8 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2388,8 +2388,8 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2399,8 +2399,8 @@ CORBA_ContainedSeq * POA_CORBA_UnionDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2408,8 +2408,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2418,8 +2418,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_UnionDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2427,8 +2427,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2437,8 +2437,8 @@ CORBA_ModuleDef_ptr POA_CORBA_UnionDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2448,8 +2448,8 @@ CORBA_ConstantDef_ptr POA_CORBA_UnionDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2460,8 +2460,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2470,8 +2470,8 @@ CORBA_StructDef_ptr POA_CORBA_UnionDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2481,8 +2481,8 @@ CORBA_StructDef_ptr POA_CORBA_UnionDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2492,8 +2492,8 @@ CORBA_UnionDef_ptr POA_CORBA_UnionDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2504,8 +2504,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2514,8 +2514,8 @@ CORBA_EnumDef_ptr POA_CORBA_UnionDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2525,8 +2525,8 @@ CORBA_EnumDef_ptr POA_CORBA_UnionDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2535,8 +2535,8 @@ CORBA_AliasDef_ptr POA_CORBA_UnionDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2546,8 +2546,8 @@ CORBA_AliasDef_ptr POA_CORBA_UnionDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2556,8 +2556,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2567,8 +2567,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2583,8 +2583,8 @@ CORBA_ValueDef_ptr POA_CORBA_UnionDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2600,8 +2600,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2610,8 +2610,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_UnionDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2621,8 +2621,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_UnionDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2631,8 +2631,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_UnionDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2642,8 +2642,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_UnionDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2651,8 +2651,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2661,8 +2661,8 @@ CORBA_NativeDef_ptr POA_CORBA_UnionDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2671,8 +2671,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_abstract_interf
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2682,8 +2682,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_abstract_interf
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2692,8 +2692,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2703,144 +2703,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_UnionDef_tie<T>::create_local_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_UnionDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_UnionDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_UnionDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_UnionDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2848,8 +2848,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2858,76 +2858,76 @@ void POA_CORBA_UnionDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_UnionDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_UnionDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_UnionDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_EnumDef_tie<T>::POA_CORBA_EnumDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -2971,175 +2971,175 @@ POA_CORBA_EnumDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_EnumDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_EnumDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_EnumDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_EnumDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_EnumMemberSeq * POA_CORBA_EnumDef_tie<T>::members  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::members  (
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->members (
-members,
-    ACE_TRY_ENV
+members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_EnumDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_EnumDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_EnumDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_EnumDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3147,8 +3147,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3157,76 +3157,76 @@ void POA_CORBA_EnumDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_EnumDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_EnumDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_EnumDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AliasDef_tie<T>::POA_CORBA_AliasDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3270,175 +3270,175 @@ POA_CORBA_AliasDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_AliasDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_AliasDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_AliasDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_AliasDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_AliasDef_tie<T>::original_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::original_type_def  (
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->original_type_def (
-original_type_def,
-    ACE_TRY_ENV
+original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_AliasDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AliasDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_AliasDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_AliasDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3446,8 +3446,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3456,76 +3456,76 @@ void POA_CORBA_AliasDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_AliasDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_AliasDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AliasDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_NativeDef_tie<T>::POA_CORBA_NativeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3569,147 +3569,147 @@ POA_CORBA_NativeDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_NativeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_NativeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_NativeDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_NativeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_NativeDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_NativeDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_NativeDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_NativeDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3717,8 +3717,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3727,76 +3727,76 @@ void POA_CORBA_NativeDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_NativeDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_NativeDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_NativeDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_PrimitiveDef_tie<T>::POA_CORBA_PrimitiveDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3840,92 +3840,92 @@ POA_CORBA_PrimitiveDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_PrimitiveDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_PrimitiveDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_PrimitiveDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_PrimitiveDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::PrimitiveKind POA_CORBA_PrimitiveDef_tie<T>::kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_PrimitiveDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_PrimitiveDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_PrimitiveDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_StringDef_tie<T>::POA_CORBA_StringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3969,107 +3969,107 @@ POA_CORBA_StringDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_StringDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_StringDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_StringDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_StringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_StringDef_tie<T>::bound  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StringDef_tie<T>::bound  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->bound (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_StringDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_StringDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_StringDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_WstringDef_tie<T>::POA_CORBA_WstringDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4113,107 +4113,107 @@ POA_CORBA_WstringDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_WstringDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_WstringDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_WstringDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_WstringDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_WstringDef_tie<T>::bound  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_WstringDef_tie<T>::bound  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->bound (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_WstringDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_WstringDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_WstringDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_SequenceDef_tie<T>::POA_CORBA_SequenceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4257,148 +4257,148 @@ POA_CORBA_SequenceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_SequenceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_SequenceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_SequenceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_SequenceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_SequenceDef_tie<T>::bound  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->bound (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_SequenceDef_tie<T>::bound  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->bound (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::element_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_SequenceDef_tie<T>::element_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_SequenceDef_tie<T>::element_type_def  (
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->element_type_def (
-element_type_def,
-    ACE_TRY_ENV
+element_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_SequenceDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_SequenceDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_SequenceDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ArrayDef_tie<T>::POA_CORBA_ArrayDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4442,148 +4442,148 @@ POA_CORBA_ArrayDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ArrayDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ArrayDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ArrayDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ArrayDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::ULong POA_CORBA_ArrayDef_tie<T>::length  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->length (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ArrayDef_tie<T>::length  (
-    CORBA::ULong length,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong length
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->length (
-length,
-    ACE_TRY_ENV
+length
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::element_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ArrayDef_tie<T>::element_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->element_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ArrayDef_tie<T>::element_type_def  (
-    CORBA_IDLType_ptr element_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->element_type_def (
-element_type_def,
-    ACE_TRY_ENV
+element_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ArrayDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ArrayDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ArrayDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ExceptionDef_tie<T>::POA_CORBA_ExceptionDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4627,188 +4627,188 @@ POA_CORBA_ExceptionDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ExceptionDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ExceptionDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ExceptionDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ExceptionDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ExceptionDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_StructMemberSeq * POA_CORBA_ExceptionDef_tie<T>::members  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->members (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::members  (
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->members (
-members,
-    ACE_TRY_ENV
+members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ExceptionDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ExceptionDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ExceptionDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ExceptionDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4816,8 +4816,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4826,31 +4826,31 @@ void POA_CORBA_ExceptionDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_ExceptionDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4858,8 +4858,8 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4868,8 +4868,8 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4879,8 +4879,8 @@ CORBA_ContainedSeq * POA_CORBA_ExceptionDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4888,8 +4888,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4898,8 +4898,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ExceptionDef_tie<T>::describe_conten
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4907,8 +4907,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4917,8 +4917,8 @@ CORBA_ModuleDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4928,8 +4928,8 @@ CORBA_ConstantDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4940,8 +4940,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4950,8 +4950,8 @@ CORBA_StructDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4961,8 +4961,8 @@ CORBA_StructDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4972,8 +4972,8 @@ CORBA_UnionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4984,8 +4984,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4994,8 +4994,8 @@ CORBA_EnumDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5005,8 +5005,8 @@ CORBA_EnumDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5015,8 +5015,8 @@ CORBA_AliasDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5026,8 +5026,8 @@ CORBA_AliasDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5036,8 +5036,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5047,8 +5047,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5063,8 +5063,8 @@ CORBA_ValueDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5080,8 +5080,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5090,8 +5090,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5101,8 +5101,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5111,8 +5111,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5122,8 +5122,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5131,8 +5131,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5141,8 +5141,8 @@ CORBA_NativeDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5151,8 +5151,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_abstract_in
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5162,8 +5162,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_abstract_in
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5172,8 +5172,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_local_interfac
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5183,63 +5183,63 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ExceptionDef_tie<T>::create_local_interfac
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ExceptionDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ExceptionDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AttributeDef_tie<T>::POA_CORBA_AttributeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -5283,216 +5283,216 @@ POA_CORBA_AttributeDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_AttributeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_AttributeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_AttributeDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_AttributeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_AttributeDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_AttributeDef_tie<T>::type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::type_def  (
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->type_def (
-type_def,
-    ACE_TRY_ENV
+type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::AttributeMode POA_CORBA_AttributeDef_tie<T>::mode  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::mode  (
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->mode (
-mode,
-    ACE_TRY_ENV
+mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_AttributeDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AttributeDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_AttributeDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_AttributeDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5500,8 +5500,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5510,63 +5510,63 @@ void POA_CORBA_AttributeDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_AttributeDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AttributeDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_OperationDef_tie<T>::POA_CORBA_OperationDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -5610,300 +5610,300 @@ POA_CORBA_OperationDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_OperationDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_OperationDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_OperationDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_OperationDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_OperationDef_tie<T>::result  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_OperationDef_tie<T>::result_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::result_def  (
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->result_def (
-result_def,
-    ACE_TRY_ENV
+result_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ParDescriptionSeq * POA_CORBA_OperationDef_tie<T>::params  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::params  (
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->params (
-params,
-    ACE_TRY_ENV
+params
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::OperationMode POA_CORBA_OperationDef_tie<T>::mode  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::mode  (
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::OperationMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->mode (
-mode,
-    ACE_TRY_ENV
+mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContextIdSeq * POA_CORBA_OperationDef_tie<T>::contexts  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::contexts  (
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->contexts (
-contexts,
-    ACE_TRY_ENV
+contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ExceptionDefSeq * POA_CORBA_OperationDef_tie<T>::exceptions  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::exceptions  (
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->exceptions (
-exceptions,
-    ACE_TRY_ENV
+exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_OperationDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_OperationDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_OperationDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_OperationDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5911,8 +5911,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5921,63 +5921,63 @@ void POA_CORBA_OperationDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_OperationDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_OperationDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_InterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_InterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_InterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_InterfaceDef_tie<T>::POA_CORBA_InterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -6021,67 +6021,67 @@ POA_CORBA_InterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_InterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_InterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_InterfaceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_InterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_InterfaceDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_InterfaceDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_InterfaceDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6091,8 +6091,8 @@ CORBA_AttributeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6103,8 +6103,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6117,8 +6117,8 @@ CORBA_OperationDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6132,31 +6132,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_InterfaceDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6164,8 +6164,8 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6174,8 +6174,8 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6185,8 +6185,8 @@ CORBA_ContainedSeq * POA_CORBA_InterfaceDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6194,8 +6194,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6204,8 +6204,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_InterfaceDef_tie<T>::describe_conten
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6213,8 +6213,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6223,8 +6223,8 @@ CORBA_ModuleDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6234,8 +6234,8 @@ CORBA_ConstantDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6246,8 +6246,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6256,8 +6256,8 @@ CORBA_StructDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6267,8 +6267,8 @@ CORBA_StructDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6278,8 +6278,8 @@ CORBA_UnionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6290,8 +6290,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6300,8 +6300,8 @@ CORBA_EnumDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6311,8 +6311,8 @@ CORBA_EnumDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6321,8 +6321,8 @@ CORBA_AliasDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6332,8 +6332,8 @@ CORBA_AliasDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6342,8 +6342,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6353,8 +6353,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6369,8 +6369,8 @@ CORBA_ValueDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6386,8 +6386,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6396,8 +6396,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6407,8 +6407,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6417,8 +6417,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6428,8 +6428,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6437,8 +6437,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6447,8 +6447,8 @@ CORBA_NativeDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6457,8 +6457,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_abstract_in
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6468,8 +6468,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_abstract_in
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6478,8 +6478,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_local_interfac
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6489,144 +6489,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_InterfaceDef_tie<T>::create_local_interfac
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_InterfaceDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_InterfaceDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_InterfaceDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_InterfaceDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6634,8 +6634,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6644,76 +6644,76 @@ void POA_CORBA_InterfaceDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_InterfaceDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_InterfaceDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_InterfaceDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_AbstractInterfaceDef_tie<T>::POA_CORBA_AbstractInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -6757,67 +6757,67 @@ POA_CORBA_AbstractInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_AbstractInterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_AbstractInterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_AbstractInterfaceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_AbstractInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_AbstractInterfaceDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_AbstractInterfaceDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -6827,8 +6827,8 @@ CORBA_AttributeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_attribute
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6839,8 +6839,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6853,8 +6853,8 @@ CORBA_OperationDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_operation
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6868,31 +6868,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6900,8 +6900,8 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6910,8 +6910,8 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6921,8 +6921,8 @@ CORBA_ContainedSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6930,8 +6930,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6940,8 +6940,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_AbstractInterfaceDef_tie<T>::describ
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6949,8 +6949,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6959,8 +6959,8 @@ CORBA_ModuleDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6970,8 +6970,8 @@ CORBA_ConstantDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6982,8 +6982,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -6992,8 +6992,8 @@ CORBA_StructDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7003,8 +7003,8 @@ CORBA_StructDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7014,8 +7014,8 @@ CORBA_UnionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7026,8 +7026,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7036,8 +7036,8 @@ CORBA_EnumDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7047,8 +7047,8 @@ CORBA_EnumDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7057,8 +7057,8 @@ CORBA_AliasDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7068,8 +7068,8 @@ CORBA_AliasDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7078,8 +7078,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7089,8 +7089,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7105,8 +7105,8 @@ CORBA_ValueDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7122,8 +7122,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7132,8 +7132,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7143,8 +7143,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7153,8 +7153,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_exception
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7164,8 +7164,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_exception
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7173,8 +7173,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7183,8 +7183,8 @@ CORBA_NativeDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7193,8 +7193,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_abs
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7204,8 +7204,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_abs
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7214,8 +7214,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_local_
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7225,144 +7225,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::create_local_
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_AbstractInterfaceDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_AbstractInterfaceDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7370,8 +7370,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7380,76 +7380,76 @@ void POA_CORBA_AbstractInterfaceDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_AbstractInterfaceDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_AbstractInterfaceDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_AbstractInterfaceDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_LocalInterfaceDef_tie<T>::POA_CORBA_LocalInterfaceDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -7493,67 +7493,67 @@ POA_CORBA_LocalInterfaceDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_LocalInterfaceDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_LocalInterfaceDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_LocalInterfaceDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_LocalInterfaceDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_LocalInterfaceDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_CORBA_LocalInterfaceDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -7563,8 +7563,8 @@ CORBA_AttributeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7575,8 +7575,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7589,8 +7589,8 @@ CORBA_OperationDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7604,31 +7604,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_LocalInterfaceDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7636,8 +7636,8 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7646,8 +7646,8 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7657,8 +7657,8 @@ CORBA_ContainedSeq * POA_CORBA_LocalInterfaceDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7666,8 +7666,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7676,8 +7676,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_LocalInterfaceDef_tie<T>::describe_c
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7685,8 +7685,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7695,8 +7695,8 @@ CORBA_ModuleDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7706,8 +7706,8 @@ CORBA_ConstantDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7718,8 +7718,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7728,8 +7728,8 @@ CORBA_StructDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7739,8 +7739,8 @@ CORBA_StructDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7750,8 +7750,8 @@ CORBA_UnionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7762,8 +7762,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7772,8 +7772,8 @@ CORBA_EnumDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7783,8 +7783,8 @@ CORBA_EnumDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7793,8 +7793,8 @@ CORBA_AliasDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7804,8 +7804,8 @@ CORBA_AliasDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7814,8 +7814,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7825,8 +7825,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7841,8 +7841,8 @@ CORBA_ValueDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7858,8 +7858,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7868,8 +7868,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7879,8 +7879,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7889,8 +7889,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7900,8 +7900,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7909,8 +7909,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7919,8 +7919,8 @@ CORBA_NativeDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7929,8 +7929,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_abstra
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7940,8 +7940,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_abstra
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -7950,8 +7950,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_local_int
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7961,144 +7961,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_LocalInterfaceDef_tie<T>::create_local_int
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_LocalInterfaceDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_LocalInterfaceDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_LocalInterfaceDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_LocalInterfaceDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -8106,8 +8106,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8116,47 +8116,47 @@ void POA_CORBA_LocalInterfaceDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_LocalInterfaceDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_LocalInterfaceDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_LocalInterfaceDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
index 39e0d457fa2..929682e2d11 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.cpp
@@ -215,36 +215,32 @@ public:
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & supports_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ComponentDef_ptr result);
@@ -271,8 +267,8 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & supports_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -284,12 +280,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -317,25 +313,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_component::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -347,7 +343,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -356,11 +352,11 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentRepository_create_component::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -382,36 +378,32 @@ public:
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::HomeDef_ptr result);
@@ -440,8 +432,8 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -454,12 +446,12 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::TAO_ServerRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -490,25 +482,25 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::arguments (CORBA::Envi
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_home::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -520,7 +512,7 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::result (CORBA::Environ
 
 char *
 TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -529,11 +521,11 @@ TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_most_derived_in
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentRepository_create_home::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -572,18 +564,18 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::~_TAO_ComponentReposi
 
 IR::_TAO_ComponentRepository_Proxy_Impl&
 POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
-    ::IR::ComponentRepository *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::ComponentRepository *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -592,8 +584,8 @@ POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_ComponentRepository_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -667,8 +659,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supports_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -683,8 +675,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_component",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -697,8 +689,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create
         name,
         version,
         base_component,
-        supports_interfaces,
-        ACE_TRY_ENV
+        supports_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -709,8 +701,8 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -725,8 +717,8 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_home",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -740,8 +732,8 @@ IR::HomeDef_ptr POA_IR::_TAO_ComponentRepository_ThruPOA_Proxy_Impl::create_home
         version,
         base_home,
         managed_component,
-        primary_key,
-        ACE_TRY_ENV
+        primary_key
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -771,8 +763,8 @@ POA_IR::ComponentRepository::~ComponentRepository (void)
 void POA_IR::ComponentRepository::create_component_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -812,13 +804,13 @@ void POA_IR::ComponentRepository::create_component_skel (
       name.in (),
       version.in (),
       base_component.in (),
-      supports_interfaces,
-      ACE_TRY_ENV
+      supports_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -828,8 +820,8 @@ void POA_IR::ComponentRepository::create_component_skel (
           name.in (),
           version.in (),
           base_component.in (),
-          supports_interfaces,
-          ACE_TRY_ENV
+          supports_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -838,20 +830,20 @@ void POA_IR::ComponentRepository::create_component_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -873,16 +865,13 @@ void POA_IR::ComponentRepository::create_component_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentRepository::create_home_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -925,13 +914,13 @@ void POA_IR::ComponentRepository::create_home_skel (
       version.in (),
       base_home.in (),
       managed_component.in (),
-      primary_key.in (),
-      ACE_TRY_ENV
+      primary_key.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -942,8 +931,8 @@ void POA_IR::ComponentRepository::create_home_skel (
           version.in (),
           base_home.in (),
           managed_component.in (),
-          primary_key.in (),
-          ACE_TRY_ENV
+          primary_key.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -952,20 +941,20 @@ void POA_IR::ComponentRepository::create_home_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -987,16 +976,13 @@ void POA_IR::ComponentRepository::create_home_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentRepository::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1006,7 +992,7 @@ void POA_IR::ComponentRepository::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1018,12 +1004,12 @@ void POA_IR::ComponentRepository::_is_a_skel (
 void POA_IR::ComponentRepository::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1035,8 +1021,8 @@ void POA_IR::ComponentRepository::_non_existent_skel (
 void POA_IR::ComponentRepository::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentRepository *_tao_impl = (POA_IR::ComponentRepository *) _tao_object_reference;
@@ -1055,7 +1041,7 @@ void POA_IR::ComponentRepository::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1081,11 +1067,11 @@ void POA_IR::ComponentRepository::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::ComponentRepository::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1116,12 +1102,12 @@ void* POA_IR::ComponentRepository::_downcast (
   return 0;
 }
 
-void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::ComponentRepository::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -1131,9 +1117,9 @@ const char* POA_IR::ComponentRepository::_interface_repository_id (void) const
 }
 
 IR::ComponentRepository*
-POA_IR::ComponentRepository::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::ComponentRepository::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1299,36 +1285,32 @@ public:
   TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ProvidesDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -1345,45 +1327,45 @@ private:
 TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ProvidesDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ProvidesDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1395,7 +1377,7 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1404,11 +1386,11 @@ TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1447,18 +1429,18 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::~_TAO_ProvidesDef_Strategized
 
 IR::_TAO_ProvidesDef_Proxy_Impl&
 POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::ProvidesDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::ProvidesDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -1467,8 +1449,8 @@ POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_ProvidesDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -1537,8 +1519,8 @@ POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::_TAO_ProvidesDef_ThruPOA_Proxy_Impl
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1553,8 +1535,8 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "interface_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -1563,7 +1545,7 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_ProvidesDef_ThruPOA_Proxy_Impl::interface_ty
           "IDL:omg.org/IR/ProvidesDef:1.0"
         )
     )->interface_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -1592,8 +1574,8 @@ POA_IR::ProvidesDef::~ProvidesDef (void)
 void POA_IR::ProvidesDef::_get_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ProvidesDef *_tao_impl =
@@ -1613,19 +1595,19 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
   TAO_ServerRequestInfo_IR_ProvidesDef_interface_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->interface_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1634,20 +1616,20 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1669,16 +1651,13 @@ void POA_IR::ProvidesDef::_get_interface_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ProvidesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1688,7 +1667,7 @@ void POA_IR::ProvidesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1700,12 +1679,12 @@ void POA_IR::ProvidesDef::_is_a_skel (
 void POA_IR::ProvidesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1717,8 +1696,8 @@ void POA_IR::ProvidesDef::_non_existent_skel (
 void POA_IR::ProvidesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ProvidesDef *_tao_impl = (POA_IR::ProvidesDef *) _tao_object_reference;
@@ -1737,7 +1716,7 @@ void POA_IR::ProvidesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1763,11 +1742,11 @@ void POA_IR::ProvidesDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::ProvidesDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1795,12 +1774,12 @@ void* POA_IR::ProvidesDef::_downcast (
   return 0;
 }
 
-void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::ProvidesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -1810,9 +1789,9 @@ const char* POA_IR::ProvidesDef::_interface_repository_id (void) const
 }
 
 IR::ProvidesDef*
-POA_IR::ProvidesDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::ProvidesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1979,36 +1958,32 @@ public:
   TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDef_ptr result);
@@ -2025,45 +2000,45 @@ private:
 TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::TAO_ServerRequestInfo_IR_UsesDef_interface_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::UsesDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::UsesDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2075,7 +2050,7 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2084,11 +2059,11 @@ TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_UsesDef_interface_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2104,36 +2079,32 @@ public:
   TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::UsesDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -2150,45 +2121,45 @@ private:
 TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::UsesDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::UsesDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2200,7 +2171,7 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2209,11 +2180,11 @@ TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2252,18 +2223,18 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::~_TAO_UsesDef_Strategized_Proxy_B
 
 IR::_TAO_UsesDef_Proxy_Impl&
 POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::UsesDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::UsesDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2272,8 +2243,8 @@ POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_UsesDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2342,8 +2313,8 @@ POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::_TAO_UsesDef_ThruPOA_Proxy_Impl (void)
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2358,8 +2329,8 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "interface_type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2368,13 +2339,13 @@ CORBA_InterfaceDef_ptr POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::interface_type (
           "IDL:omg.org/IR/UsesDef:1.0"
         )
     )->interface_type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2389,8 +2360,8 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_multiple",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -2399,7 +2370,7 @@ CORBA::Boolean POA_IR::_TAO_UsesDef_ThruPOA_Proxy_Impl::is_multiple (
           "IDL:omg.org/IR/UsesDef:1.0"
         )
     )->is_multiple (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -2428,8 +2399,8 @@ POA_IR::UsesDef::~UsesDef (void)
 void POA_IR::UsesDef::_get_interface_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl =
@@ -2449,19 +2420,19 @@ void POA_IR::UsesDef::_get_interface_type_skel (
   TAO_ServerRequestInfo_IR_UsesDef_interface_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->interface_type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2470,20 +2441,20 @@ void POA_IR::UsesDef::_get_interface_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2505,16 +2476,13 @@ void POA_IR::UsesDef::_get_interface_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::UsesDef::_get_is_multiple_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl =
@@ -2534,19 +2502,19 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
   TAO_ServerRequestInfo_IR_UsesDef_is_multiple_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_multiple (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2554,20 +2522,20 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2589,16 +2557,13 @@ void POA_IR::UsesDef::_get_is_multiple_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::UsesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2608,7 +2573,7 @@ void POA_IR::UsesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2620,12 +2585,12 @@ void POA_IR::UsesDef::_is_a_skel (
 void POA_IR::UsesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2637,8 +2602,8 @@ void POA_IR::UsesDef::_non_existent_skel (
 void POA_IR::UsesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::UsesDef *_tao_impl = (POA_IR::UsesDef *) _tao_object_reference;
@@ -2657,7 +2622,7 @@ void POA_IR::UsesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -2683,11 +2648,11 @@ void POA_IR::UsesDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::UsesDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -2715,12 +2680,12 @@ void* POA_IR::UsesDef::_downcast (
   return 0;
 }
 
-void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::UsesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -2730,9 +2695,9 @@ const char* POA_IR::UsesDef::_interface_repository_id (void) const
 }
 
 IR::UsesDef*
-POA_IR::UsesDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::UsesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -2900,36 +2865,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl
     ,
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * event_id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -2948,8 +2909,8 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::EventDef *tao_impl,
-    const char * event_id,
-    CORBA::Environment &
+    const char * event_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2957,12 +2918,12 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::TAO_ServerRequestInfo_IR_EventDef_is_a (
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2978,25 +2939,25 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::arguments (CORBA::Environment &ACE_TRY_E
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3008,7 +2969,7 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
 
 char *
 TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3017,11 +2978,11 @@ TAO_ServerRequestInfo_IR_EventDef_is_a::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_EventDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3037,36 +2998,32 @@ public:
   TAO_ServerRequestInfo_IR_EventDef_event_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::EventDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -3083,45 +3040,45 @@ private:
 TAO_ServerRequestInfo_IR_EventDef_event_get::TAO_ServerRequestInfo_IR_EventDef_event_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::EventDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::EventDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_event_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_event_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_EventDef_event_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3133,7 +3090,7 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::result (CORBA::Environment &ACE_TRY
 
 char *
 TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3142,11 +3099,11 @@ TAO_ServerRequestInfo_IR_EventDef_event_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_EventDef_event_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3185,18 +3142,18 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::~_TAO_EventDef_Strategized_Proxy
 
 IR::_TAO_EventDef_Proxy_Impl&
 POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::EventDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::EventDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -3205,8 +3162,8 @@ POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_EventDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -3276,8 +3233,8 @@ POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::_TAO_EventDef_ThruPOA_Proxy_Impl (void
 
 CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3292,8 +3249,8 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_a",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -3302,14 +3259,14 @@ CORBA::Boolean POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::is_a (
           "IDL:omg.org/IR/EventDef:1.0"
         )
     )->is_a (
-        event_id,
-        ACE_TRY_ENV
+        event_id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3324,8 +3281,8 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "event",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -3334,7 +3291,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl::event (
           "IDL:omg.org/IR/EventDef:1.0"
         )
     )->event (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -3363,8 +3320,8 @@ POA_IR::EventDef::~EventDef (void)
 void POA_IR::EventDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3392,20 +3349,20 @@ void POA_IR::EventDef::is_a_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      event_id.in (),
-      ACE_TRY_ENV
+      event_id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
-          event_id.in (),
-          ACE_TRY_ENV
+          event_id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3413,20 +3370,20 @@ void POA_IR::EventDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3448,16 +3405,13 @@ void POA_IR::EventDef::is_a_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::EventDef::_get_event_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef *_tao_impl =
@@ -3477,19 +3431,19 @@ void POA_IR::EventDef::_get_event_skel (
   TAO_ServerRequestInfo_IR_EventDef_event_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->event (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -3498,20 +3452,20 @@ void POA_IR::EventDef::_get_event_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -3533,16 +3487,13 @@ void POA_IR::EventDef::_get_event_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::EventDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3552,7 +3503,7 @@ void POA_IR::EventDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3564,12 +3515,12 @@ void POA_IR::EventDef::_is_a_skel (
 void POA_IR::EventDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -3581,8 +3532,8 @@ void POA_IR::EventDef::_non_existent_skel (
 void POA_IR::EventDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef *_tao_impl = (POA_IR::EventDef *) _tao_object_reference;
@@ -3601,7 +3552,7 @@ void POA_IR::EventDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3627,11 +3578,11 @@ void POA_IR::EventDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::EventDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3659,12 +3610,12 @@ void* POA_IR::EventDef::_downcast (
   return 0;
 }
 
-void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::EventDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -3674,9 +3625,9 @@ const char* POA_IR::EventDef::_interface_repository_id (void) const
 }
 
 IR::EventDef*
-POA_IR::EventDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::EventDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3866,18 +3817,18 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::~_TAO_EmitsDef_Strategized_Proxy
 
 IR::_TAO_EmitsDef_Proxy_Impl&
 POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::EmitsDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::EmitsDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -3886,8 +3837,8 @@ POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_EmitsDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -3981,8 +3932,8 @@ POA_IR::EmitsDef::~EmitsDef (void)
 void POA_IR::EmitsDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -3992,7 +3943,7 @@ void POA_IR::EmitsDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4004,12 +3955,12 @@ void POA_IR::EmitsDef::_is_a_skel (
 void POA_IR::EmitsDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4021,8 +3972,8 @@ void POA_IR::EmitsDef::_non_existent_skel (
 void POA_IR::EmitsDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EmitsDef *_tao_impl = (POA_IR::EmitsDef *) _tao_object_reference;
@@ -4041,7 +3992,7 @@ void POA_IR::EmitsDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4067,11 +4018,11 @@ void POA_IR::EmitsDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::EmitsDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4102,12 +4053,12 @@ void* POA_IR::EmitsDef::_downcast (
   return 0;
 }
 
-void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::EmitsDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -4117,9 +4068,9 @@ const char* POA_IR::EmitsDef::_interface_repository_id (void) const
 }
 
 IR::EmitsDef*
-POA_IR::EmitsDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::EmitsDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4309,18 +4260,18 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::~_TAO_PublishesDef_Strategiz
 
 IR::_TAO_PublishesDef_Proxy_Impl&
 POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::PublishesDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::PublishesDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -4329,8 +4280,8 @@ POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_PublishesDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -4424,8 +4375,8 @@ POA_IR::PublishesDef::~PublishesDef (void)
 void POA_IR::PublishesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4435,7 +4386,7 @@ void POA_IR::PublishesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4447,12 +4398,12 @@ void POA_IR::PublishesDef::_is_a_skel (
 void POA_IR::PublishesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4464,8 +4415,8 @@ void POA_IR::PublishesDef::_non_existent_skel (
 void POA_IR::PublishesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PublishesDef *_tao_impl = (POA_IR::PublishesDef *) _tao_object_reference;
@@ -4484,7 +4435,7 @@ void POA_IR::PublishesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4510,11 +4461,11 @@ void POA_IR::PublishesDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::PublishesDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4545,12 +4496,12 @@ void* POA_IR::PublishesDef::_downcast (
   return 0;
 }
 
-void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::PublishesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -4560,9 +4511,9 @@ const char* POA_IR::PublishesDef::_interface_repository_id (void) const
 }
 
 IR::PublishesDef*
-POA_IR::PublishesDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::PublishesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -4752,18 +4703,18 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::~_TAO_ConsumesDef_Strategized
 
 IR::_TAO_ConsumesDef_Proxy_Impl&
 POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::ConsumesDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::ConsumesDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -4772,8 +4723,8 @@ POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_ConsumesDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -4867,8 +4818,8 @@ POA_IR::ConsumesDef::~ConsumesDef (void)
 void POA_IR::ConsumesDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -4878,7 +4829,7 @@ void POA_IR::ConsumesDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4890,12 +4841,12 @@ void POA_IR::ConsumesDef::_is_a_skel (
 void POA_IR::ConsumesDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -4907,8 +4858,8 @@ void POA_IR::ConsumesDef::_non_existent_skel (
 void POA_IR::ConsumesDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ConsumesDef *_tao_impl = (POA_IR::ConsumesDef *) _tao_object_reference;
@@ -4927,7 +4878,7 @@ void POA_IR::ConsumesDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -4953,11 +4904,11 @@ void POA_IR::ConsumesDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::ConsumesDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -4988,12 +4939,12 @@ void* POA_IR::ConsumesDef::_downcast (
   return 0;
 }
 
-void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::ConsumesDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -5003,9 +4954,9 @@ const char* POA_IR::ConsumesDef::_interface_repository_id (void) const
 }
 
 IR::ConsumesDef*
-POA_IR::ConsumesDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::ConsumesDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -5213,36 +5164,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -5259,45 +5206,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5309,7 +5256,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::result (CORBA::E
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5318,11 +5265,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_most_deri
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5339,36 +5286,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
     ,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -5386,8 +5329,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::ComponentDef *tao_impl,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5395,12 +5338,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::TAO_ServerReques
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5416,25 +5359,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::arguments (CORBA
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5442,7 +5385,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::result (CORBA::E
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5451,11 +5394,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_most_deri
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_IR_ComponentDef_base_component_get : public TAO_ServerRequestInfo
@@ -5464,36 +5407,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ComponentDef_ptr result);
@@ -5510,45 +5449,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::TAO_ServerRequestInfo_IR_ComponentDef_base_component_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5560,7 +5499,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::result (CORBA::Environ
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5569,11 +5508,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_most_derived_in
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_base_component_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5589,36 +5528,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ProvidesDefSeq * result);
@@ -5635,45 +5570,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5685,7 +5620,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5694,11 +5629,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5714,36 +5649,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::UsesDefSeq * result);
@@ -5760,45 +5691,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5810,7 +5741,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5819,11 +5750,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5839,36 +5770,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::EmitsDefSeq * result);
@@ -5885,45 +5812,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5935,7 +5862,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5944,11 +5871,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5964,36 +5891,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PublishesDefSeq * result);
@@ -6010,45 +5933,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6060,7 +5983,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::result (CORBA::Envir
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6069,11 +5992,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_most_derived_
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6089,36 +6012,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ConsumesDefSeq * result);
@@ -6135,45 +6054,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6185,7 +6104,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::result (CORBA::Enviro
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6194,11 +6113,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_most_derived_i
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6214,36 +6133,32 @@ public:
   TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::ComponentDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -6260,45 +6175,45 @@ private:
 TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::ComponentDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::ComponentDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6310,7 +6225,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6319,11 +6234,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6343,36 +6258,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_InterfaceDef_ptr interface_type
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ProvidesDef_ptr result);
@@ -6397,8 +6308,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_
     const char * id,
     const char * name,
     const char * version,
-    CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &
+    CORBA_InterfaceDef_ptr interface_type
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6409,12 +6320,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::TAO_ServerRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6439,25 +6350,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_provides::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6469,7 +6380,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6478,11 +6389,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_provides::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6503,36 +6414,32 @@ public:
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
-    const CORBA::Boolean & is_multiple,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & is_multiple
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::UsesDef_ptr result);
@@ -6559,8 +6466,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
-    const CORBA::Boolean & is_multiple,
-    CORBA::Environment &
+    const CORBA::Boolean & is_multiple
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6572,12 +6479,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::TAO_ServerRequestInfo_IR_Comp
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6605,25 +6512,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::arguments (CORBA::Environment
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_uses::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6635,7 +6542,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::result (CORBA::Environment &A
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6644,11 +6551,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_uses::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6668,36 +6575,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::EmitsDef_ptr result);
@@ -6722,8 +6625,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6734,12 +6637,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::TAO_ServerRequestInfo_IR_Com
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6764,25 +6667,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_emits::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6794,7 +6697,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6803,11 +6706,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_emits::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6827,36 +6730,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PublishesDef_ptr result);
@@ -6881,8 +6780,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -6893,12 +6792,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::TAO_ServerRequestInfo_IR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -6923,25 +6822,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::arguments (CORBA::Enviro
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -6953,7 +6852,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -6962,11 +6861,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_publishes::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -6986,36 +6885,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ConsumesDef_ptr result);
@@ -7040,8 +6935,8 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -7052,12 +6947,12 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::TAO_ServerRequestInfo_IR_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -7082,25 +6977,25 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -7112,7 +7007,7 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -7121,11 +7016,11 @@ TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_ComponentDef_create_consumes::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -7164,18 +7059,18 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::~_TAO_ComponentDef_Strategiz
 
 IR::_TAO_ComponentDef_Proxy_Impl&
 POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::ComponentDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::ComponentDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -7184,8 +7079,8 @@ POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_ComponentDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -7254,8 +7149,8 @@ POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::_TAO_ComponentDef_ThruPOA_Proxy_Im
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7270,8 +7165,8 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7280,14 +7175,14 @@ CORBA_InterfaceDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->supported_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7300,8 +7195,8 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -7310,15 +7205,15 @@ void POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::supported_interfaces (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->supported_interfaces (
-        supported_interfaces,
-        ACE_TRY_ENV
+        supported_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_component (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7333,8 +7228,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_component",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7343,13 +7238,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::base_componen
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->base_component (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7364,8 +7259,8 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "provides_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7374,13 +7269,13 @@ IR::ProvidesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::provides_inte
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->provides_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7395,8 +7290,8 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "uses_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7405,13 +7300,13 @@ IR::UsesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::uses_interfaces (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->uses_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7426,8 +7321,8 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "emits_events",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7436,13 +7331,13 @@ IR::EmitsDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::emits_events (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->emits_events (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_events (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7457,8 +7352,8 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "publishes_events",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7467,13 +7362,13 @@ IR::PublishesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::publishes_ev
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->publishes_events (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_events (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7488,8 +7383,8 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "consumes_events",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7498,13 +7393,13 @@ IR::ConsumesDefSeq * POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::consumes_even
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->consumes_events (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7519,8 +7414,8 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_basic",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -7529,7 +7424,7 @@ CORBA::Boolean POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::is_basic (
           "IDL:omg.org/IR/ComponentDef:1.0"
         )
     )->is_basic (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -7538,8 +7433,8 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
     const char * id,
     const char * name,
     const char * version,
-    CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_InterfaceDef_ptr interface_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7554,8 +7449,8 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_provides",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7567,8 +7462,8 @@ IR::ProvidesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_provide
         id,
         name,
         version,
-        interface_type,
-        ACE_TRY_ENV
+        interface_type
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7578,8 +7473,8 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Boolean is_multiple,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_multiple
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7594,8 +7489,8 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_uses",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7608,8 +7503,8 @@ IR::UsesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_uses (
         name,
         version,
         interface_type,
-        is_multiple,
-        ACE_TRY_ENV
+        is_multiple
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7618,8 +7513,8 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7634,8 +7529,8 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_emits",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7647,8 +7542,8 @@ IR::EmitsDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_emits (
         id,
         name,
         version,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7657,8 +7552,8 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7673,8 +7568,8 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_publishes",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7686,8 +7581,8 @@ IR::PublishesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_publis
         id,
         name,
         version,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7696,8 +7591,8 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -7712,8 +7607,8 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_consumes",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -7725,8 +7620,8 @@ IR::ConsumesDef_ptr POA_IR::_TAO_ComponentDef_ThruPOA_Proxy_Impl::create_consume
         id,
         name,
         version,
-        value,
-        ACE_TRY_ENV
+        value
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -7758,8 +7653,8 @@ POA_IR::ComponentDef::~ComponentDef (void)
 void POA_IR::ComponentDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -7779,19 +7674,19 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_supported_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->supported_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7800,20 +7695,20 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7835,16 +7730,13 @@ void POA_IR::ComponentDef::_get_supported_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7872,39 +7764,39 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      supported_interfaces,
-      ACE_TRY_ENV
+      supported_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->supported_interfaces (
-          supported_interfaces,
-          ACE_TRY_ENV
+          supported_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7919,16 +7811,13 @@ void POA_IR::ComponentDef::_set_supported_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_base_component_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -7948,19 +7837,19 @@ void POA_IR::ComponentDef::_get_base_component_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_base_component_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_component (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7969,20 +7858,20 @@ void POA_IR::ComponentDef::_get_base_component_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8004,16 +7893,13 @@ void POA_IR::ComponentDef::_get_base_component_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_provides_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8033,19 +7919,19 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_provides_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->provides_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8054,20 +7940,20 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8089,16 +7975,13 @@ void POA_IR::ComponentDef::_get_provides_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_uses_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8118,19 +8001,19 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_uses_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->uses_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8139,20 +8022,20 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8174,16 +8057,13 @@ void POA_IR::ComponentDef::_get_uses_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_emits_events_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8203,19 +8083,19 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_emits_events_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->emits_events (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8224,20 +8104,20 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8259,16 +8139,13 @@ void POA_IR::ComponentDef::_get_emits_events_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_publishes_events_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8288,19 +8165,19 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_publishes_events_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->publishes_events (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8309,20 +8186,20 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8344,16 +8221,13 @@ void POA_IR::ComponentDef::_get_publishes_events_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_consumes_events_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8373,19 +8247,19 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_consumes_events_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->consumes_events (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8394,20 +8268,20 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8429,16 +8303,13 @@ void POA_IR::ComponentDef::_get_consumes_events_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_get_is_basic_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl =
@@ -8458,19 +8329,19 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
   TAO_ServerRequestInfo_IR_ComponentDef_is_basic_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_basic (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8478,20 +8349,20 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8513,16 +8384,13 @@ void POA_IR::ComponentDef::_get_is_basic_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_provides_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8559,13 +8427,13 @@ void POA_IR::ComponentDef::create_provides_skel (
       id.in (),
       name.in (),
       version.in (),
-      interface_type.in (),
-      ACE_TRY_ENV
+      interface_type.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8574,8 +8442,8 @@ void POA_IR::ComponentDef::create_provides_skel (
           id.in (),
           name.in (),
           version.in (),
-          interface_type.in (),
-          ACE_TRY_ENV
+          interface_type.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8584,20 +8452,20 @@ void POA_IR::ComponentDef::create_provides_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8619,16 +8487,13 @@ void POA_IR::ComponentDef::create_provides_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_uses_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8668,13 +8533,13 @@ void POA_IR::ComponentDef::create_uses_skel (
       name.in (),
       version.in (),
       interface_type.in (),
-      is_multiple,
-      ACE_TRY_ENV
+      is_multiple
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8684,8 +8549,8 @@ void POA_IR::ComponentDef::create_uses_skel (
           name.in (),
           version.in (),
           interface_type.in (),
-          is_multiple,
-          ACE_TRY_ENV
+          is_multiple
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8694,20 +8559,20 @@ void POA_IR::ComponentDef::create_uses_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8729,16 +8594,13 @@ void POA_IR::ComponentDef::create_uses_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_emits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8775,13 +8637,13 @@ void POA_IR::ComponentDef::create_emits_skel (
       id.in (),
       name.in (),
       version.in (),
-      value.in (),
-      ACE_TRY_ENV
+      value.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8790,8 +8652,8 @@ void POA_IR::ComponentDef::create_emits_skel (
           id.in (),
           name.in (),
           version.in (),
-          value.in (),
-          ACE_TRY_ENV
+          value.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8800,20 +8662,20 @@ void POA_IR::ComponentDef::create_emits_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8835,16 +8697,13 @@ void POA_IR::ComponentDef::create_emits_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_publishes_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8881,13 +8740,13 @@ void POA_IR::ComponentDef::create_publishes_skel (
       id.in (),
       name.in (),
       version.in (),
-      value.in (),
-      ACE_TRY_ENV
+      value.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8896,8 +8755,8 @@ void POA_IR::ComponentDef::create_publishes_skel (
           id.in (),
           name.in (),
           version.in (),
-          value.in (),
-          ACE_TRY_ENV
+          value.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8906,20 +8765,20 @@ void POA_IR::ComponentDef::create_publishes_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8941,16 +8800,13 @@ void POA_IR::ComponentDef::create_publishes_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::create_consumes_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8987,13 +8843,13 @@ void POA_IR::ComponentDef::create_consumes_skel (
       id.in (),
       name.in (),
       version.in (),
-      value.in (),
-      ACE_TRY_ENV
+      value.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -9002,8 +8858,8 @@ void POA_IR::ComponentDef::create_consumes_skel (
           id.in (),
           name.in (),
           version.in (),
-          value.in (),
-          ACE_TRY_ENV
+          value.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9012,20 +8868,20 @@ void POA_IR::ComponentDef::create_consumes_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9047,16 +8903,13 @@ void POA_IR::ComponentDef::create_consumes_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::ComponentDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9066,7 +8919,7 @@ void POA_IR::ComponentDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9078,12 +8931,12 @@ void POA_IR::ComponentDef::_is_a_skel (
 void POA_IR::ComponentDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9095,8 +8948,8 @@ void POA_IR::ComponentDef::_non_existent_skel (
 void POA_IR::ComponentDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::ComponentDef *_tao_impl = (POA_IR::ComponentDef *) _tao_object_reference;
@@ -9115,7 +8968,7 @@ void POA_IR::ComponentDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9141,11 +8994,11 @@ void POA_IR::ComponentDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::ComponentDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9182,12 +9035,12 @@ void* POA_IR::ComponentDef::_downcast (
   return 0;
 }
 
-void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::ComponentDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9197,9 +9050,9 @@ const char* POA_IR::ComponentDef::_interface_repository_id (void) const
 }
 
 IR::ComponentDef*
-POA_IR::ComponentDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::ComponentDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -9367,36 +9220,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl
     ,
-    const char * primary_key_id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * primary_key_id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -9415,8 +9264,8 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_IR::PrimaryKeyDef *tao_impl,
-    const char * primary_key_id,
-    CORBA::Environment &
+    const char * primary_key_id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -9424,12 +9273,12 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::TAO_ServerRequestInfo_IR_PrimaryKey
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -9445,25 +9294,25 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::arguments (CORBA::Environment &ACE_
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9475,7 +9324,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::result (CORBA::Environment &ACE_TRY
 
 char *
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9484,11 +9333,11 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9504,36 +9353,32 @@ public:
   TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::PrimaryKeyDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -9550,45 +9395,45 @@ private:
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::PrimaryKeyDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::PrimaryKeyDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -9600,7 +9445,7 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -9609,11 +9454,11 @@ TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -9652,18 +9497,18 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::~_TAO_PrimaryKeyDef_Strateg
 
 IR::_TAO_PrimaryKeyDef_Proxy_Impl&
 POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::PrimaryKeyDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::PrimaryKeyDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -9672,8 +9517,8 @@ POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_PrimaryKeyDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -9743,8 +9588,8 @@ POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::_TAO_PrimaryKeyDef_ThruPOA_Proxy_
 
 CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
-    const char * primary_key_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * primary_key_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9759,8 +9604,8 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_a",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -9769,14 +9614,14 @@ CORBA::Boolean POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::is_a (
           "IDL:omg.org/IR/PrimaryKeyDef:1.0"
         )
     )->is_a (
-        primary_key_id,
-        ACE_TRY_ENV
+        primary_key_id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9791,8 +9636,8 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "primary_key",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -9801,7 +9646,7 @@ CORBA_ValueDef_ptr POA_IR::_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl::primary_key (
           "IDL:omg.org/IR/PrimaryKeyDef:1.0"
         )
     )->primary_key (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -9830,8 +9675,8 @@ POA_IR::PrimaryKeyDef::~PrimaryKeyDef (void)
 void POA_IR::PrimaryKeyDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9859,20 +9704,20 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      primary_key_id.in (),
-      ACE_TRY_ENV
+      primary_key_id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
-          primary_key_id.in (),
-          ACE_TRY_ENV
+          primary_key_id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9880,20 +9725,20 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9915,16 +9760,13 @@ void POA_IR::PrimaryKeyDef::is_a_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PrimaryKeyDef *_tao_impl =
@@ -9944,19 +9786,19 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
   TAO_ServerRequestInfo_IR_PrimaryKeyDef_primary_key_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->primary_key (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9965,20 +9807,20 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -10000,16 +9842,13 @@ void POA_IR::PrimaryKeyDef::_get_primary_key_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::PrimaryKeyDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10019,7 +9858,7 @@ void POA_IR::PrimaryKeyDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10031,12 +9870,12 @@ void POA_IR::PrimaryKeyDef::_is_a_skel (
 void POA_IR::PrimaryKeyDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10048,8 +9887,8 @@ void POA_IR::PrimaryKeyDef::_non_existent_skel (
 void POA_IR::PrimaryKeyDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::PrimaryKeyDef *_tao_impl = (POA_IR::PrimaryKeyDef *) _tao_object_reference;
@@ -10068,7 +9907,7 @@ void POA_IR::PrimaryKeyDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10094,11 +9933,11 @@ void POA_IR::PrimaryKeyDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::PrimaryKeyDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10126,12 +9965,12 @@ void* POA_IR::PrimaryKeyDef::_downcast (
   return 0;
 }
 
-void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::PrimaryKeyDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10141,9 +9980,9 @@ const char* POA_IR::PrimaryKeyDef::_interface_repository_id (void) const
 }
 
 IR::PrimaryKeyDef*
-POA_IR::PrimaryKeyDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::PrimaryKeyDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10393,18 +10232,18 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::~_TAO_FactoryDef_Strategized_P
 
 IR::_TAO_FactoryDef_Proxy_Impl&
 POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::FactoryDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::FactoryDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10413,8 +10252,8 @@ POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_FactoryDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -10508,8 +10347,8 @@ POA_IR::FactoryDef::~FactoryDef (void)
 void POA_IR::FactoryDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -10519,7 +10358,7 @@ void POA_IR::FactoryDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10531,12 +10370,12 @@ void POA_IR::FactoryDef::_is_a_skel (
 void POA_IR::FactoryDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -10548,8 +10387,8 @@ void POA_IR::FactoryDef::_non_existent_skel (
 void POA_IR::FactoryDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::FactoryDef *_tao_impl = (POA_IR::FactoryDef *) _tao_object_reference;
@@ -10568,7 +10407,7 @@ void POA_IR::FactoryDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -10594,11 +10433,11 @@ void POA_IR::FactoryDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::FactoryDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -10629,12 +10468,12 @@ void* POA_IR::FactoryDef::_downcast (
   return 0;
 }
 
-void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::FactoryDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -10644,9 +10483,9 @@ const char* POA_IR::FactoryDef::_interface_repository_id (void) const
 }
 
 IR::FactoryDef*
-POA_IR::FactoryDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::FactoryDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -10896,18 +10735,18 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::~_TAO_FinderDef_Strategized_Pro
 
 IR::_TAO_FinderDef_Proxy_Impl&
 POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::FinderDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::FinderDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -10916,8 +10755,8 @@ POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_FinderDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -11011,8 +10850,8 @@ POA_IR::FinderDef::~FinderDef (void)
 void POA_IR::FinderDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -11022,7 +10861,7 @@ void POA_IR::FinderDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11034,12 +10873,12 @@ void POA_IR::FinderDef::_is_a_skel (
 void POA_IR::FinderDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -11051,8 +10890,8 @@ void POA_IR::FinderDef::_non_existent_skel (
 void POA_IR::FinderDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::FinderDef *_tao_impl = (POA_IR::FinderDef *) _tao_object_reference;
@@ -11071,7 +10910,7 @@ void POA_IR::FinderDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -11097,11 +10936,11 @@ void POA_IR::FinderDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::FinderDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -11132,12 +10971,12 @@ void* POA_IR::FinderDef::_downcast (
   return 0;
 }
 
-void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::FinderDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -11147,9 +10986,9 @@ const char* POA_IR::FinderDef::_interface_repository_id (void) const
 }
 
 IR::FinderDef*
-POA_IR::FinderDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::FinderDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -11351,36 +11190,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::HomeDef_ptr result);
@@ -11397,45 +11232,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_base_home_get::TAO_ServerRequestInfo_IR_HomeDef_base_home_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_base_home_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_base_home_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11447,7 +11282,7 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11456,11 +11291,11 @@ TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_base_home_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11476,36 +11311,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::ComponentDef_ptr result);
@@ -11522,45 +11353,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::TAO_ServerRequestInfo_IR_HomeDef_managed_component_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11572,7 +11403,7 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::result (CORBA::Environme
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11581,11 +11412,11 @@ TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_most_derived_inte
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_managed_component_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11601,36 +11432,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PrimaryKeyDef_ptr result);
@@ -11647,45 +11474,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::TAO_ServerRequestInfo_IR_HomeDef_primary_key_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11697,7 +11524,7 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::result (CORBA::Environment &AC
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11706,11 +11533,11 @@ TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_most_derived_interface
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_primary_key_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11726,36 +11553,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_factories_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FactoryDefSeq * result);
@@ -11772,45 +11595,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_factories_get::TAO_ServerRequestInfo_IR_HomeDef_factories_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_factories_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_factories_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11822,7 +11645,7 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11831,11 +11654,11 @@ TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_factories_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11851,36 +11674,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_finders_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FinderDefSeq * result);
@@ -11897,45 +11716,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_finders_get::TAO_ServerRequestInfo_IR_HomeDef_finders_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_finders_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_finders_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -11947,7 +11766,7 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::result (CORBA::Environment &ACE_TR
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -11956,11 +11775,11 @@ TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_finders_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -11976,36 +11795,32 @@ public:
   TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_IR::HomeDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -12022,45 +11837,45 @@ private:
 TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::TAO_ServerRequestInfo_IR_HomeDef_is_basic_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_IR::HomeDef *tao_impl,
-    CORBA::Environment &
+    POA_IR::HomeDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12072,7 +11887,7 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::result (CORBA::Environment &ACE_T
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12081,11 +11896,11 @@ TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_is_basic_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12105,36 +11920,32 @@ public:
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::PrimaryKeyDef_ptr result);
@@ -12159,8 +11970,8 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12171,12 +11982,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::TAO_ServerRequestInfo_IR_Ho
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12201,25 +12012,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12231,7 +12042,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12240,11 +12051,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_create_primary_key::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12265,36 +12076,32 @@ public:
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FactoryDef_ptr result);
@@ -12321,8 +12128,8 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12334,12 +12141,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::TAO_ServerRequestInfo_IR_HomeDe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12367,25 +12174,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_factory::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12397,7 +12204,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12406,11 +12213,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_create_factory::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12431,36 +12238,32 @@ public:
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (IR::FinderDef_ptr result);
@@ -12487,8 +12290,8 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -12500,12 +12303,12 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::TAO_ServerRequestInfo_IR_HomeDef
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -12533,25 +12336,25 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_finder::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -12563,7 +12366,7 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -12572,11 +12375,11 @@ TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_IR_HomeDef_create_finder::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -12615,18 +12418,18 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::~_TAO_HomeDef_Strategized_Proxy_B
 
 IR::_TAO_HomeDef_Proxy_Impl&
 POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
-    ::IR::HomeDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::IR::HomeDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -12635,8 +12438,8 @@ POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 POA_IR::_TAO_HomeDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -12705,8 +12508,8 @@ POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::_TAO_HomeDef_ThruPOA_Proxy_Impl (void)
 // ThruPOA Implementation of the IDL interface methods
 
 IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12721,8 +12524,8 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_home",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12731,13 +12534,13 @@ IR::HomeDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::base_home (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->base_home (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12752,8 +12555,8 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "managed_component",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12762,13 +12565,13 @@ IR::ComponentDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::managed_component
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->managed_component (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12783,8 +12586,8 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "primary_key",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12793,13 +12596,13 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::primary_key (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->primary_key (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12814,8 +12617,8 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "factories",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12824,13 +12627,13 @@ IR::FactoryDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::factories (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->factories (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12845,8 +12648,8 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "finders",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12855,13 +12658,13 @@ IR::FinderDefSeq * POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::finders (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->finders (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12876,8 +12679,8 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_basic",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -12886,7 +12689,7 @@ CORBA::Boolean POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::is_basic (
           "IDL:omg.org/IR/HomeDef:1.0"
         )
     )->is_basic (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -12895,8 +12698,8 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12911,8 +12714,8 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_primary_key",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12924,8 +12727,8 @@ IR::PrimaryKeyDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_primary_ke
         id,
         name,
         version,
-        primary_key,
-        ACE_TRY_ENV
+        primary_key
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -12935,8 +12738,8 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12951,8 +12754,8 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_factory",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -12965,8 +12768,8 @@ IR::FactoryDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_factory (
         name,
         version,
         params,
-        exceptions,
-        ACE_TRY_ENV
+        exceptions
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -12976,8 +12779,8 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -12992,8 +12795,8 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_finder",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -13006,8 +12809,8 @@ IR::FinderDef_ptr POA_IR::_TAO_HomeDef_ThruPOA_Proxy_Impl::create_finder (
         name,
         version,
         params,
-        exceptions,
-        ACE_TRY_ENV
+        exceptions
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -13039,8 +12842,8 @@ POA_IR::HomeDef::~HomeDef (void)
 void POA_IR::HomeDef::_get_base_home_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13060,19 +12863,19 @@ void POA_IR::HomeDef::_get_base_home_skel (
   TAO_ServerRequestInfo_IR_HomeDef_base_home_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_home (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13081,20 +12884,20 @@ void POA_IR::HomeDef::_get_base_home_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13116,16 +12919,13 @@ void POA_IR::HomeDef::_get_base_home_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_managed_component_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13145,19 +12945,19 @@ void POA_IR::HomeDef::_get_managed_component_skel (
   TAO_ServerRequestInfo_IR_HomeDef_managed_component_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->managed_component (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13166,20 +12966,20 @@ void POA_IR::HomeDef::_get_managed_component_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13201,16 +13001,13 @@ void POA_IR::HomeDef::_get_managed_component_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13230,19 +13027,19 @@ void POA_IR::HomeDef::_get_primary_key_skel (
   TAO_ServerRequestInfo_IR_HomeDef_primary_key_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->primary_key (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13251,20 +13048,20 @@ void POA_IR::HomeDef::_get_primary_key_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13286,16 +13083,13 @@ void POA_IR::HomeDef::_get_primary_key_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_factories_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13315,19 +13109,19 @@ void POA_IR::HomeDef::_get_factories_skel (
   TAO_ServerRequestInfo_IR_HomeDef_factories_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->factories (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13336,20 +13130,20 @@ void POA_IR::HomeDef::_get_factories_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13371,16 +13165,13 @@ void POA_IR::HomeDef::_get_factories_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_finders_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13400,19 +13191,19 @@ void POA_IR::HomeDef::_get_finders_skel (
   TAO_ServerRequestInfo_IR_HomeDef_finders_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->finders (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13421,20 +13212,20 @@ void POA_IR::HomeDef::_get_finders_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13456,16 +13247,13 @@ void POA_IR::HomeDef::_get_finders_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_get_is_basic_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl =
@@ -13485,19 +13273,19 @@ void POA_IR::HomeDef::_get_is_basic_skel (
   TAO_ServerRequestInfo_IR_HomeDef_is_basic_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_basic (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13505,20 +13293,20 @@ void POA_IR::HomeDef::_get_is_basic_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13540,16 +13328,13 @@ void POA_IR::HomeDef::_get_is_basic_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::create_primary_key_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13586,13 +13371,13 @@ void POA_IR::HomeDef::create_primary_key_skel (
       id.in (),
       name.in (),
       version.in (),
-      primary_key.in (),
-      ACE_TRY_ENV
+      primary_key.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -13601,8 +13386,8 @@ void POA_IR::HomeDef::create_primary_key_skel (
           id.in (),
           name.in (),
           version.in (),
-          primary_key.in (),
-          ACE_TRY_ENV
+          primary_key.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13611,20 +13396,20 @@ void POA_IR::HomeDef::create_primary_key_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13646,16 +13431,13 @@ void POA_IR::HomeDef::create_primary_key_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::create_factory_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13695,13 +13477,13 @@ void POA_IR::HomeDef::create_factory_skel (
       name.in (),
       version.in (),
       params,
-      exceptions,
-      ACE_TRY_ENV
+      exceptions
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -13711,8 +13493,8 @@ void POA_IR::HomeDef::create_factory_skel (
           name.in (),
           version.in (),
           params,
-          exceptions,
-          ACE_TRY_ENV
+          exceptions
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13721,20 +13503,20 @@ void POA_IR::HomeDef::create_factory_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13756,16 +13538,13 @@ void POA_IR::HomeDef::create_factory_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::create_finder_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13805,13 +13584,13 @@ void POA_IR::HomeDef::create_finder_skel (
       name.in (),
       version.in (),
       params,
-      exceptions,
-      ACE_TRY_ENV
+      exceptions
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -13821,8 +13600,8 @@ void POA_IR::HomeDef::create_finder_skel (
           name.in (),
           version.in (),
           params,
-          exceptions,
-          ACE_TRY_ENV
+          exceptions
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -13831,20 +13610,20 @@ void POA_IR::HomeDef::create_finder_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -13866,16 +13645,13 @@ void POA_IR::HomeDef::create_finder_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_IR::HomeDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -13885,7 +13661,7 @@ void POA_IR::HomeDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13897,12 +13673,12 @@ void POA_IR::HomeDef::_is_a_skel (
 void POA_IR::HomeDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -13914,8 +13690,8 @@ void POA_IR::HomeDef::_non_existent_skel (
 void POA_IR::HomeDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::HomeDef *_tao_impl = (POA_IR::HomeDef *) _tao_object_reference;
@@ -13934,7 +13710,7 @@ void POA_IR::HomeDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -13960,11 +13736,11 @@ void POA_IR::HomeDef::_interface_skel (
 }
 
 CORBA::Boolean POA_IR::HomeDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -14001,12 +13777,12 @@ void* POA_IR::HomeDef::_downcast (
   return 0;
 }
 
-void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_IR::HomeDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -14016,9 +13792,9 @@ const char* POA_IR::HomeDef::_interface_repository_id (void) const
 }
 
 IR::HomeDef*
-POA_IR::HomeDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_IR::HomeDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
index e77ec38042c..ce0d7b2a01a 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.h
@@ -54,7 +54,7 @@ TAO_NAMESPACE  POA_IR
   // Forward Classes Declaration
   class _TAO_ComponentRepository_ThruPOA_Proxy_Impl;
   class _TAO_ComponentRepository_Strategized_Proxy_Broker;
-  
+
   class  ComponentRepository : public virtual POA_CORBA_Repository
   {
   protected:
@@ -66,10 +66,9 @@ TAO_NAMESPACE  POA_IR
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -78,34 +77,33 @@ TAO_NAMESPACE  POA_IR
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::ComponentRepository *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
@@ -114,19 +112,18 @@ TAO_NAMESPACE  POA_IR
         const char * name,
         const char * version,
         IR::ComponentDef_ptr base_component,
-        const CORBA_InterfaceDefSeq & supports_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & supports_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_component_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::HomeDef_ptr create_home (
@@ -135,317 +132,289 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_home_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void lookup_id_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void get_canonical_typecode_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void get_primitive_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_string_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_wstring_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_sequence_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_array_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_fixed_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_name_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_module_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_constant_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_struct_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_union_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_enum_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_alias_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_box_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_exception_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_native_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_abstract_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_local_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_ComponentRepository_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentRepository_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_ComponentRepository_Proxy_Impl &select_proxy (
-      ::IR::ComponentRepository *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::ComponentRepository *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
-  
+
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
   private:
-    
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_ComponentRepository_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_ComponentRepository_Strategized_Proxy_Broker *the_TAO_ComponentRepository_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_ComponentRepository_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_ComponentRepository_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_ComponentRepository_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Repository_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_ComponentRepository_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ComponentRepository_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual IR::ComponentDef_ptr create_component (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
         IR::ComponentDef_ptr base_component,
-        const CORBA_InterfaceDefSeq & supports_interfaces,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA_InterfaceDefSeq & supports_interfaces
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::HomeDef_ptr create_home (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
@@ -453,27 +422,27 @@ TAO_NAMESPACE  POA_IR
         const char * version,
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class ProvidesDef;
   typedef ProvidesDef *ProvidesDef_ptr;
   // Forward Classes Declaration
   class _TAO_ProvidesDef_ThruPOA_Proxy_Impl;
   class _TAO_ProvidesDef_Strategized_Proxy_Broker;
-  
+
   class  ProvidesDef : public virtual POA_CORBA_Contained
   {
   protected:
@@ -485,10 +454,9 @@ TAO_NAMESPACE  POA_IR
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -497,245 +465,230 @@ TAO_NAMESPACE  POA_IR
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::ProvidesDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA_InterfaceDef_ptr interface_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_interface_type_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_ProvidesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ProvidesDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_ProvidesDef_Proxy_Impl &select_proxy (
-      ::IR::ProvidesDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::ProvidesDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_ProvidesDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_ProvidesDef_Strategized_Proxy_Broker *the_TAO_ProvidesDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_ProvidesDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_ProvidesDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_ProvidesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_ProvidesDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ProvidesDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA_InterfaceDef_ptr interface_type (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class UsesDef;
   typedef UsesDef *UsesDef_ptr;
   // Forward Classes Declaration
   class _TAO_UsesDef_ThruPOA_Proxy_Impl;
   class _TAO_UsesDef_Strategized_Proxy_Broker;
-  
+
   class  UsesDef : public virtual POA_CORBA_Contained
   {
   protected:
@@ -747,10 +700,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -759,268 +711,252 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::UsesDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA_InterfaceDef_ptr interface_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_interface_type_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA::Boolean is_multiple (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_is_multiple_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_UsesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_UsesDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_UsesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_UsesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_UsesDef_Proxy_Impl &select_proxy (
-      ::IR::UsesDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::UsesDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_UsesDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_UsesDef_Strategized_Proxy_Broker *the_TAO_UsesDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_UsesDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_UsesDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_UsesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_UsesDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_UsesDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA_InterfaceDef_ptr interface_type (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA::Boolean is_multiple (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class EventDef;
   typedef EventDef *EventDef_ptr;
   // Forward Classes Declaration
   class _TAO_EventDef_ThruPOA_Proxy_Impl;
   class _TAO_EventDef_Strategized_Proxy_Broker;
-  
+
   class  EventDef : public virtual POA_CORBA_Contained
   {
   protected:
@@ -1032,10 +968,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -1044,270 +979,254 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::EventDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void is_a_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_event_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_EventDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EventDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_EventDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_EventDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_EventDef_Proxy_Impl &select_proxy (
-      ::IR::EventDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::EventDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_EventDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_EventDef_Strategized_Proxy_Broker *the_TAO_EventDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_EventDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_EventDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_EventDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_EventDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_EventDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA::Boolean is_a (
         CORBA_Object *_collocated_tao_target_,
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * event_id
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA_ValueDef_ptr event (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class EmitsDef;
   typedef EmitsDef *EmitsDef_ptr;
   // Forward Classes Declaration
   class _TAO_EmitsDef_ThruPOA_Proxy_Impl;
   class _TAO_EmitsDef_Strategized_Proxy_Broker;
-  
+
   class  EmitsDef : public virtual EventDef
   {
   protected:
@@ -1319,10 +1238,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -1331,238 +1249,222 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::EmitsDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_event_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_EmitsDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_EmitsDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_EmitsDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_EmitsDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_EmitsDef_Proxy_Impl &select_proxy (
-      ::IR::EmitsDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::EmitsDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_EmitsDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_EmitsDef_Strategized_Proxy_Broker *the_TAO_EmitsDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_EmitsDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_EmitsDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_EmitsDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_EmitsDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_EmitsDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class PublishesDef;
   typedef PublishesDef *PublishesDef_ptr;
   // Forward Classes Declaration
   class _TAO_PublishesDef_ThruPOA_Proxy_Impl;
   class _TAO_PublishesDef_Strategized_Proxy_Broker;
-  
+
   class  PublishesDef : public virtual EventDef
   {
   protected:
@@ -1574,10 +1476,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -1586,238 +1487,222 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::PublishesDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_event_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_PublishesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PublishesDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_PublishesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_PublishesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_PublishesDef_Proxy_Impl &select_proxy (
-      ::IR::PublishesDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::PublishesDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_PublishesDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_PublishesDef_Strategized_Proxy_Broker *the_TAO_PublishesDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_PublishesDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_PublishesDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_PublishesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_PublishesDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_PublishesDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class ConsumesDef;
   typedef ConsumesDef *ConsumesDef_ptr;
   // Forward Classes Declaration
   class _TAO_ConsumesDef_ThruPOA_Proxy_Impl;
   class _TAO_ConsumesDef_Strategized_Proxy_Broker;
-  
+
   class  ConsumesDef : public virtual EventDef
   {
   protected:
@@ -1829,10 +1714,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -1841,238 +1725,222 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::ConsumesDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_event_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_ConsumesDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ConsumesDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ConsumesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_ConsumesDef_Proxy_Impl &select_proxy (
-      ::IR::ConsumesDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::ConsumesDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_ConsumesDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_ConsumesDef_Strategized_Proxy_Broker *the_TAO_ConsumesDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_ConsumesDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_ConsumesDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_ConsumesDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::POA_IR::_TAO_EventDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_ConsumesDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ConsumesDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class ComponentDef;
   typedef ComponentDef *ComponentDef_ptr;
   // Forward Classes Declaration
   class _TAO_ComponentDef_ThruPOA_Proxy_Impl;
   class _TAO_ComponentDef_Strategized_Proxy_Broker;
-  
+
   class  ComponentDef : public virtual POA_CORBA_InterfaceDef
   {
   protected:
@@ -2084,10 +1952,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -2096,190 +1963,179 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::ComponentDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA_InterfaceDefSeq * supported_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_supported_interfaces_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void supported_interfaces (
-        const CORBA_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & supported_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _set_supported_interfaces_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ComponentDef_ptr base_component (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_base_component_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ProvidesDefSeq * provides_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_provides_interfaces_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::UsesDefSeq * uses_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_uses_interfaces_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::EmitsDefSeq * emits_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_emits_events_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::PublishesDefSeq * publishes_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_publishes_events_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ConsumesDefSeq * consumes_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_consumes_events_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA::Boolean is_basic (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_is_basic_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ProvidesDef_ptr create_provides (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_InterfaceDef_ptr interface_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_provides_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::UsesDef_ptr create_uses (
@@ -2287,589 +2143,548 @@ private:
         const char * name,
         const char * version,
         CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Boolean is_multiple,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean is_multiple
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_uses_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::EmitsDef_ptr create_emits (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_emits_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::PublishesDef_ptr create_publishes (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_publishes_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ConsumesDef_ptr create_consumes (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_consumes_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_attribute_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_operation_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_name_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_module_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_constant_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_struct_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_union_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_enum_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_alias_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_box_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_exception_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_native_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_abstract_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_local_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_ComponentDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_ComponentDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_ComponentDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_ComponentDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_ComponentDef_Proxy_Impl &select_proxy (
-      ::IR::ComponentDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::ComponentDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_ComponentDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_ComponentDef_Strategized_Proxy_Broker *the_TAO_ComponentDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_ComponentDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_ComponentDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_ComponentDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_ComponentDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_ComponentDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA_InterfaceDefSeq * supported_interfaces (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual void supported_interfaces (
         CORBA_Object *_collocated_tao_target_,
-        const CORBA_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA_InterfaceDefSeq & supported_interfaces
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ComponentDef_ptr base_component (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ProvidesDefSeq * provides_interfaces (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::UsesDefSeq * uses_interfaces (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::EmitsDefSeq * emits_events (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::PublishesDefSeq * publishes_events (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ConsumesDefSeq * consumes_events (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA::Boolean is_basic (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ProvidesDef_ptr create_provides (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_InterfaceDef_ptr interface_type
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::UsesDef_ptr create_uses (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
         CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Boolean is_multiple,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA::Boolean is_multiple
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::EmitsDef_ptr create_emits (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::PublishesDef_ptr create_publishes (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ConsumesDef_ptr create_consumes (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class PrimaryKeyDef;
   typedef PrimaryKeyDef *PrimaryKeyDef_ptr;
   // Forward Classes Declaration
   class _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl;
   class _TAO_PrimaryKeyDef_Strategized_Proxy_Broker;
-  
+
   class  PrimaryKeyDef : public virtual POA_CORBA_Contained
   {
   protected:
@@ -2881,10 +2696,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -2893,270 +2707,254 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::PrimaryKeyDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual CORBA::Boolean is_a (
-        const char * primary_key_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * primary_key_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void is_a_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA_ValueDef_ptr primary_key (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_primary_key_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_PrimaryKeyDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl &select_proxy (
-      ::IR::PrimaryKeyDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::PrimaryKeyDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_PrimaryKeyDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_PrimaryKeyDef_Strategized_Proxy_Broker *the_TAO_PrimaryKeyDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_PrimaryKeyDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_PrimaryKeyDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual CORBA::Boolean is_a (
         CORBA_Object *_collocated_tao_target_,
-        const char * primary_key_id,
-        CORBA::Environment &ACE_TRY_ENV
+        const char * primary_key_id
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA_ValueDef_ptr primary_key (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class FactoryDef;
   typedef FactoryDef *FactoryDef_ptr;
   // Forward Classes Declaration
   class _TAO_FactoryDef_ThruPOA_Proxy_Impl;
   class _TAO_FactoryDef_Strategized_Proxy_Broker;
-  
+
   class  FactoryDef : public virtual POA_CORBA_OperationDef
   {
   protected:
@@ -3168,10 +2966,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -3180,310 +2977,285 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::FactoryDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void _get_result_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_params_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_params_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_FactoryDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FactoryDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_FactoryDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_FactoryDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_FactoryDef_Proxy_Impl &select_proxy (
-      ::IR::FactoryDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::FactoryDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_FactoryDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_FactoryDef_Strategized_Proxy_Broker *the_TAO_FactoryDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_FactoryDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_FactoryDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_FactoryDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_FactoryDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_FactoryDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class FinderDef;
   typedef FinderDef *FinderDef_ptr;
   // Forward Classes Declaration
   class _TAO_FinderDef_ThruPOA_Proxy_Impl;
   class _TAO_FinderDef_Strategized_Proxy_Broker;
-  
+
   class  FinderDef : public virtual POA_CORBA_OperationDef
   {
   protected:
@@ -3495,10 +3267,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -3507,310 +3278,285 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::FinderDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     static void _get_result_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_result_def_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_params_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_params_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_mode_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_contexts_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_exceptions_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_FinderDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_FinderDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_FinderDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_FinderDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_FinderDef_Proxy_Impl &select_proxy (
-      ::IR::FinderDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::FinderDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_FinderDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_FinderDef_Strategized_Proxy_Broker *the_TAO_FinderDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_FinderDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_FinderDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_FinderDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_OperationDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_FinderDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_FinderDef_ThruPOA_Proxy_Impl (void) { }
-    
+
   };
-  
+
 
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   class HomeDef;
   typedef HomeDef *HomeDef_ptr;
   // Forward Classes Declaration
   class _TAO_HomeDef_ThruPOA_Proxy_Impl;
   class _TAO_HomeDef_Strategized_Proxy_Broker;
-  
+
   class  HomeDef : public virtual POA_CORBA_InterfaceDef
   {
   protected:
@@ -3822,10 +3568,9 @@ private:
 
 
     virtual CORBA::Boolean _is_a (
-        const char* logical_type_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        const char* logical_type_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual void* _downcast (
         const char* logical_type_id
@@ -3834,144 +3579,136 @@ private:
     static void _is_a_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _non_existent_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _interface_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual void _dispatch (
         TAO_ServerRequest &req,
-        void *_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     ::IR::HomeDef *_this (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
     virtual const char* _interface_repository_id (void) const;
 
     virtual IR::HomeDef_ptr base_home (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_base_home_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::ComponentDef_ptr managed_component (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_managed_component_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::PrimaryKeyDef_ptr primary_key (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_primary_key_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::FactoryDefSeq * factories (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_factories_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::FinderDefSeq * finders (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_finders_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual CORBA::Boolean is_basic (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void _get_is_basic_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::PrimaryKeyDef_ptr create_primary_key (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_primary_key_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::FactoryDef_ptr create_factory (
@@ -3979,19 +3716,18 @@ private:
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_factory_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     virtual IR::FinderDef_ptr create_finder (
@@ -3999,478 +3735,440 @@ private:
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       )) = 0;
-    
+
         static void create_finder_skel (
         TAO_ServerRequest &_tao_req,
         void *_tao_obj,
-        void *_tao_servant_upcall,
-        CORBA::Environment &ACE_TRY_ENV
+        void *_tao_servant_upcall
+        TAO_ENV_ARG_DECL
       );
 
     static void _get_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_base_interfaces_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void is_a_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_attribute_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_operation_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void lookup_name_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_contents_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_module_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_constant_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_struct_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_union_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_enum_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_alias_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_value_box_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_exception_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_native_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_abstract_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void create_local_interface_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_id_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _set_version_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_defined_in_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_absolute_name_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_containing_repository_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void describe_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void move_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_type_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void _get_def_kind_skel (
         TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
     static void destroy_skel (
-        TAO_ServerRequest &req, 
+        TAO_ServerRequest &req,
         void *obj,
-        void *context,
-        CORBA::Environment &ACE_TRY_ENV =
-          TAO_default_environment ()
-      );
+        void *context
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
   };
 
-  
+
   ///////////////////////////////////////////////////////////////////////
-  //               Strategized Proxy Broker Declaration 
+  //               Strategized Proxy Broker Declaration
   //
-  
+
   class  _TAO_HomeDef_Strategized_Proxy_Broker : public virtual ::IR::_TAO_HomeDef_Proxy_Broker
   {
-  public: 
+  public:
     _TAO_HomeDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ~_TAO_HomeDef_Strategized_Proxy_Broker (void);
-    
+
     virtual ::IR::_TAO_HomeDef_Proxy_Impl &select_proxy (
-      ::IR::HomeDef *object,
-      CORBA_Environment &ACE_TRY_ENV
+      ::IR::HomeDef *object
+      TAO_ENV_ARG_DECL
     );
-  
+
   private:
 
     // Helper methods that takes care to create the proxy
     // as soon as their use is necessary.
     void create_proxy (
-      int collocation_strategy,
-      CORBA::Environment &ACE_TRY_ENV
+      int collocation_strategy
+      TAO_ENV_ARG_DECL
     );
-    
+
 private:
-  
+
     // Caches the proxy implementations. The proxy implementation
     // are totally stateless, and those can be shared by all the
     // instances of a given IDL interface type.
     ::IR::_TAO_HomeDef_Proxy_Impl
     *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-    
+
     TAO_SYNCH_MUTEX mutex_;
     // This funxtion is used to get an handle to the unique instance
     // of the Strategized Proxy Broker that is available for a given
     // interface.
-  
+
   public:
     static _TAO_HomeDef_Strategized_Proxy_Broker *the_TAO_HomeDef_Strategized_Proxy_Broker (void);
   };
-  
-  
+
+
   //
-  //            End Strategized Proxy Broker Declaration 
+  //            End Strategized Proxy Broker Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
   ///////////////////////////////////////////////////////////////////////
   //                    ThruPOA  Impl. Declaration
   //
-  
-  class  _TAO_HomeDef_ThruPOA_Proxy_Impl : 
+
+  class  _TAO_HomeDef_ThruPOA_Proxy_Impl :
     public virtual ::IR::_TAO_HomeDef_Proxy_Impl,
     public virtual TAO_ThruPOA_Object_Proxy_Impl,
     public virtual ::_TAO_CORBA_InterfaceDef_ThruPOA_Proxy_Impl
-    
+
   {
   public:
     _TAO_HomeDef_ThruPOA_Proxy_Impl (void);
-    
+
     virtual ~_TAO_HomeDef_ThruPOA_Proxy_Impl (void) { }
-    
+
     virtual IR::HomeDef_ptr base_home (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::ComponentDef_ptr managed_component (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::PrimaryKeyDef_ptr primary_key (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::FactoryDefSeq * factories (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::FinderDefSeq * finders (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual CORBA::Boolean is_basic (
-        CORBA_Object *_collocated_tao_target_,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_Object *_collocated_tao_target_
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::PrimaryKeyDef_ptr create_primary_key (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::FactoryDef_ptr create_factory (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
     virtual IR::FinderDef_ptr create_finder (
         CORBA_Object *_collocated_tao_target_,
         const char * id,
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL
       )
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
-    
+
+
   };
-  
+
   //
   //                ThruPOA  Proxy Impl. Declaration
   ///////////////////////////////////////////////////////////////////////
-  
-  
+
+
 }
 TAO_NAMESPACE_CLOSE // module IR
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
index 4547c6557e1..96f3fd02407 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS.i
@@ -22,3690 +22,3690 @@
 ACE_INLINE void POA_IR::ComponentRepository::lookup_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::lookup_id_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::get_canonical_typecode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::get_canonical_typecode_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::get_primitive_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::get_primitive_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_string_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_string_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_wstring_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_wstring_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_sequence_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_sequence_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_array_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_array_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_fixed_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Repository_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Repository::create_fixed_skel (
       req,
       (POA_CORBA_Repository_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentRepository::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentRepository_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ProvidesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ProvidesDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::UsesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::UsesDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EventDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EventDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_IR::EventDef::is_a_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_event_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_IR::EventDef::_get_event_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::EmitsDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::EmitsDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_IR::EventDef::is_a_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_event_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_IR::EventDef::_get_event_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PublishesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PublishesDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_IR::EventDef::is_a_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_event_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_IR::EventDef_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_IR::EventDef::_get_event_skel (
       req,
       (POA_IR::EventDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ConsumesDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ConsumesDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::ComponentDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::ComponentDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::PrimaryKeyDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::PrimaryKeyDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_result_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_result_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_params_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_params_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_get_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_OperationDef::_set_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FactoryDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FactoryDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_result_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_result_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_result_def_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_result_def_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_params_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_params_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_params_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_mode_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_mode_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_contexts_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_contexts_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_get_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_exceptions_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_OperationDef_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_OperationDef::_set_exceptions_skel (
       req,
       (POA_CORBA_OperationDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::FinderDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::FinderDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::_get_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_base_interfaces_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::_set_base_interfaces_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::is_a_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::is_a_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::describe_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::describe_interface_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_attribute_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_attribute_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_operation_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_InterfaceDef_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_InterfaceDef::create_operation_skel (
       req,
       (POA_CORBA_InterfaceDef_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_IR::HomeDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_IR::HomeDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
index 59b55988067..500e9839c58 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.h
@@ -49,7 +49,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~ComponentRepository_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -61,241 +61,219 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     IR::ComponentDef_ptr create_component (
         const char * id,
         const char * name,
         const char * version,
         IR::ComponentDef_ptr base_component,
-        const CORBA_InterfaceDefSeq & supports_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & supports_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::HomeDef_ptr create_home (
         const char * id,
         const char * name,
         const char * version,
         IR::HomeDef_ptr base_home,
         IR::ComponentDef_ptr managed_component,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained_ptr lookup_id (
-        const char * search_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * search_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::TypeCode_ptr get_canonical_typecode (
-        CORBA::TypeCode_ptr tc,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::TypeCode_ptr tc
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_PrimitiveDef_ptr get_primitive (
-        CORBA::PrimitiveKind kind,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::PrimitiveKind kind
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_StringDef_ptr create_string (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::ULong bound
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_WstringDef_ptr create_wstring (
-        CORBA::ULong bound,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::ULong bound
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_SequenceDef_ptr create_sequence (
         CORBA::ULong bound,
-        CORBA_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr element_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ArrayDef_ptr create_array (
         CORBA::ULong length,
-        CORBA_IDLType_ptr element_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr element_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_FixedDef_ptr create_fixed (
         CORBA::UShort digits,
-        CORBA::Short scale,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Short scale
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained_ptr lookup (
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * search_name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * lookup_name (
         const char * search_name,
         CORBA::Long levels_to_search,
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container::DescriptionSeq * describe_contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Long max_returned_objs
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ModuleDef_ptr create_module (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::Any & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr discriminator_type,
-        const CORBA_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_UnionMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_EnumMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -306,94 +284,86 @@ TAO_NAMESPACE  POA_IR
         CORBA::Boolean is_truncatable,
         const CORBA_ValueDefSeq & abstract_base_values,
         const CORBA_InterfaceDefSeq & supported_interfaces,
-        const CORBA_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InitializerSeq & initializers
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_NativeDef_ptr create_native (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_AbstractInterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ComponentRepository_tie (const ComponentRepository_tie &);
     void operator= (const ComponentRepository_tie &);
@@ -414,7 +384,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~ProvidesDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -426,135 +396,120 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA_InterfaceDef_ptr interface_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ProvidesDef_tie (const ProvidesDef_tie &);
     void operator= (const ProvidesDef_tie &);
@@ -575,7 +530,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~UsesDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -587,143 +542,127 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA_InterfaceDef_ptr interface_type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_multiple (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     UsesDef_tie (const UsesDef_tie &);
     void operator= (const UsesDef_tie &);
@@ -744,7 +683,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~EventDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -756,144 +695,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     EventDef_tie (const EventDef_tie &);
     void operator= (const EventDef_tie &);
@@ -914,7 +837,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~EmitsDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -926,144 +849,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     EmitsDef_tie (const EmitsDef_tie &);
     void operator= (const EmitsDef_tie &);
@@ -1084,7 +991,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~PublishesDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -1096,144 +1003,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     PublishesDef_tie (const PublishesDef_tie &);
     void operator= (const PublishesDef_tie &);
@@ -1254,7 +1145,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~ConsumesDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -1266,144 +1157,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * event_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * event_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr event (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ConsumesDef_tie (const ConsumesDef_tie &);
     void operator= (const ConsumesDef_tie &);
@@ -1424,7 +1299,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~ComponentDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -1436,193 +1311,173 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA_InterfaceDefSeq * supported_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void supported_interfaces (
-        const CORBA_InterfaceDefSeq & supported_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & supported_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ComponentDef_ptr base_component (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ProvidesDefSeq * provides_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::UsesDefSeq * uses_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::EmitsDefSeq * emits_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::PublishesDefSeq * publishes_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ConsumesDefSeq * consumes_events (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_basic (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ProvidesDef_ptr create_provides (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_InterfaceDef_ptr interface_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::UsesDef_ptr create_uses (
         const char * id,
         const char * name,
         const char * version,
         CORBA_InterfaceDef_ptr interface_type,
-        CORBA::Boolean is_multiple,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean is_multiple
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::EmitsDef_ptr create_emits (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::PublishesDef_ptr create_publishes (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ConsumesDef_ptr create_consumes (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDefSeq * base_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void base_interfaces (
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_a (
-        const char * interface_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * interface_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::AttributeMode mode
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_OperationDef_ptr create_operation (
         const char * id,
         const char * name,
@@ -1631,141 +1486,129 @@ TAO_NAMESPACE  POA_IR
         CORBA::OperationMode mode,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions,
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ContextIdSeq & contexts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained_ptr lookup (
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * search_name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * lookup_name (
         const char * search_name,
         CORBA::Long levels_to_search,
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container::DescriptionSeq * describe_contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Long max_returned_objs
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ModuleDef_ptr create_module (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::Any & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr discriminator_type,
-        const CORBA_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_UnionMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_EnumMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -1776,196 +1619,176 @@ TAO_NAMESPACE  POA_IR
         CORBA::Boolean is_truncatable,
         const CORBA_ValueDefSeq & abstract_base_values,
         const CORBA_InterfaceDefSeq & supported_interfaces,
-        const CORBA_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InitializerSeq & initializers
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_NativeDef_ptr create_native (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_AbstractInterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     ComponentDef_tie (const ComponentDef_tie &);
     void operator= (const ComponentDef_tie &);
@@ -1986,7 +1809,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~PrimaryKeyDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -1998,144 +1821,128 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::Boolean is_a (
-        const char * primary_key_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * primary_key_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr primary_key (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     PrimaryKeyDef_tie (const PrimaryKeyDef_tie &);
     void operator= (const PrimaryKeyDef_tie &);
@@ -2156,7 +1963,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~FactoryDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -2168,220 +1975,195 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::TypeCode_ptr result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_IDLType_ptr result_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void result_def (
-        CORBA_IDLType_ptr result_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr result_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ParDescriptionSeq * params (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void params (
-        const CORBA_ParDescriptionSeq & params,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ParDescriptionSeq & params
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::OperationMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void mode (
-        CORBA::OperationMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::OperationMode mode
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContextIdSeq * contexts (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void contexts (
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ContextIdSeq & contexts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDefSeq * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void exceptions (
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     FactoryDef_tie (const FactoryDef_tie &);
     void operator= (const FactoryDef_tie &);
@@ -2402,7 +2184,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~FinderDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -2414,220 +2196,195 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     CORBA::TypeCode_ptr result (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_IDLType_ptr result_def (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void result_def (
-        CORBA_IDLType_ptr result_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr result_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ParDescriptionSeq * params (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void params (
-        const CORBA_ParDescriptionSeq & params,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ParDescriptionSeq & params
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::OperationMode mode (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void mode (
-        CORBA::OperationMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::OperationMode mode
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContextIdSeq * contexts (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void contexts (
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ContextIdSeq & contexts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDefSeq * exceptions (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void exceptions (
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     FinderDef_tie (const FinderDef_tie &);
     void operator= (const FinderDef_tie &);
@@ -2648,7 +2405,7 @@ TAO_NAMESPACE  POA_IR
     // ctor with T*, ownership flag and a POA
     ~HomeDef_tie (void);
     // dtor
-    
+
     // TIE specific functions
     T *_tied_object (void);
     // return the underlying object
@@ -2660,145 +2417,130 @@ TAO_NAMESPACE  POA_IR
     // do we own it
     void _is_owner (CORBA::Boolean b);
     // set the ownership
-    
+
     // overridden ServantBase operations
     PortableServer::POA_ptr _default_POA (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      );
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
     IR::HomeDef_ptr base_home (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::ComponentDef_ptr managed_component (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::PrimaryKeyDef_ptr primary_key (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::FactoryDefSeq * factories (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::FinderDefSeq * finders (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_basic (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::PrimaryKeyDef_ptr create_primary_key (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_ValueDef_ptr primary_key,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_ValueDef_ptr primary_key
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::FactoryDef_ptr create_factory (
         const char * id,
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         IR::FinderDef_ptr create_finder (
         const char * id,
         const char * name,
         const char * version,
         const CORBA_ParDescriptionSeq & params,
-        const CORBA_ExceptionDefSeq & exceptions,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ExceptionDefSeq & exceptions
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDefSeq * base_interfaces (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void base_interfaces (
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::Boolean is_a (
-        const char * interface_id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * interface_id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef::FullInterfaceDescription * describe_interface (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AttributeDef_ptr create_attribute (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        CORBA::AttributeMode mode,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::AttributeMode mode
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_OperationDef_ptr create_operation (
         const char * id,
         const char * name,
@@ -2807,141 +2549,129 @@ TAO_NAMESPACE  POA_IR
         CORBA::OperationMode mode,
         const CORBA_ParDescriptionSeq & params,
         const CORBA_ExceptionDefSeq & exceptions,
-        const CORBA_ContextIdSeq & contexts,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_ContextIdSeq & contexts
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained_ptr lookup (
-        const char * search_name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * search_name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * contents (
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ContainedSeq * lookup_name (
         const char * search_name,
         CORBA::Long levels_to_search,
         CORBA::DefinitionKind limit_type,
-        CORBA::Boolean exclude_inherited,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Boolean exclude_inherited
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container::DescriptionSeq * describe_contents (
         CORBA::DefinitionKind limit_type,
         CORBA::Boolean exclude_inherited,
-        CORBA::Long max_returned_objs,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA::Long max_returned_objs
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ModuleDef_ptr create_module (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ConstantDef_ptr create_constant (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr type,
-        const CORBA::Any & value,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA::Any & value
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_StructDef_ptr create_struct (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_UnionDef_ptr create_union (
         const char * id,
         const char * name,
         const char * version,
         CORBA_IDLType_ptr discriminator_type,
-        const CORBA_UnionMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_UnionMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_EnumDef_ptr create_enum (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_EnumMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_EnumMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AliasDef_ptr create_alias (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_InterfaceDef_ptr create_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueDef_ptr create_value (
         const char * id,
         const char * name,
@@ -2952,196 +2682,176 @@ TAO_NAMESPACE  POA_IR
         CORBA::Boolean is_truncatable,
         const CORBA_ValueDefSeq & abstract_base_values,
         const CORBA_InterfaceDefSeq & supported_interfaces,
-        const CORBA_InitializerSeq & initializers,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InitializerSeq & initializers
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ValueBoxDef_ptr create_value_box (
         const char * id,
         const char * name,
         const char * version,
-        CORBA_IDLType_ptr original_type_def,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        CORBA_IDLType_ptr original_type_def
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_ExceptionDef_ptr create_exception (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_StructMemberSeq & members,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_StructMemberSeq & members
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_NativeDef_ptr create_native (
         const char * id,
         const char * name,
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_AbstractInterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_LocalInterfaceDef_ptr create_local_interface (
         const char * id,
         const char * name,
         const char * version,
-        const CORBA_InterfaceDefSeq & base_interfaces,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const CORBA_InterfaceDefSeq & base_interfaces
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * id (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void id (
-        const char * id,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * id
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void name (
-        const char * name,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * name
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * version (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void version (
-        const char * version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Container_ptr defined_in (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         char * absolute_name (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Repository_ptr containing_repository (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA_Contained::Description * describe (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void move (
         CORBA_Container_ptr new_container,
         const char * new_name,
-        const char * new_version,
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        const char * new_version
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::TypeCode_ptr type (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         CORBA::DefinitionKind def_kind (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
         void destroy (
-        CORBA::Environment &ACE_TRY_ENV = 
-          TAO_default_environment ()
-      )
+        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((
         CORBA::SystemException
       ));
-    
+
       private:
     T *ptr_;
     PortableServer::POA_var poa_;
     CORBA::Boolean rel_;
-    
+
     // copy and assignment are not allowed
     HomeDef_tie (const HomeDef_tie &);
     void operator= (const HomeDef_tie &);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
index fad9acbda38..6742e31f286 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ComponentsS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_IR::ComponentRepository_tie<T>::ComponentRepository_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentRepository_tie<T>::ComponentRepository_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentRepository_tie<T>::ComponentRepository_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentRepository_tie<T>::ComponentRepository_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -90,12 +90,12 @@ POA_IR::ComponentRepository_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ComponentRepository_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::ComponentRepository_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ComponentRepository::_default_POA (ACE_TRY_ENV);
+  return this->ComponentRepository::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
@@ -104,8 +104,8 @@ IR::ComponentDef_ptr POA_IR::ComponentRepository_tie<T>::create_component  (
     const char * name,
     const char * version,
     IR::ComponentDef_ptr base_component,
-    const CORBA_InterfaceDefSeq & supports_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supports_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -116,8 +116,8 @@ id,
     name,
     version,
     base_component,
-    supports_interfaces,
-    ACE_TRY_ENV
+    supports_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -128,8 +128,8 @@ IR::HomeDef_ptr POA_IR::ComponentRepository_tie<T>::create_home  (
     const char * version,
     IR::HomeDef_ptr base_home,
     IR::ComponentDef_ptr managed_component,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -141,91 +141,91 @@ id,
     version,
     base_home,
     managed_component,
-    primary_key,
-    ACE_TRY_ENV
+    primary_key
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup_id  (
-    const char * search_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup_id (
-search_id,
-    ACE_TRY_ENV
+search_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::ComponentRepository_tie<T>::get_canonical_typecode  (
-    CORBA::TypeCode_ptr tc,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::TypeCode_ptr tc
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->get_canonical_typecode (
-tc,
-    ACE_TRY_ENV
+tc
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_PrimitiveDef_ptr POA_IR::ComponentRepository_tie<T>::get_primitive  (
-    CORBA::PrimitiveKind kind,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::PrimitiveKind kind
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->get_primitive (
-kind,
-    ACE_TRY_ENV
+kind
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_StringDef_ptr POA_IR::ComponentRepository_tie<T>::create_string  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->create_string (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_WstringDef_ptr POA_IR::ComponentRepository_tie<T>::create_wstring  (
-    CORBA::ULong bound,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::ULong bound
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->create_wstring (
-bound,
-    ACE_TRY_ENV
+bound
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence  (
     CORBA::ULong bound,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -233,16 +233,16 @@ CORBA_SequenceDef_ptr POA_IR::ComponentRepository_tie<T>::create_sequence  (
 {
   return this->ptr_->create_sequence (
 bound,
-    element_type,
-    ACE_TRY_ENV
+    element_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array  (
     CORBA::ULong length,
-    CORBA_IDLType_ptr element_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr element_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -250,16 +250,16 @@ CORBA_ArrayDef_ptr POA_IR::ComponentRepository_tie<T>::create_array  (
 {
   return this->ptr_->create_array (
 length,
-    element_type,
-    ACE_TRY_ENV
+    element_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed  (
     CORBA::UShort digits,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -267,31 +267,31 @@ CORBA_FixedDef_ptr POA_IR::ComponentRepository_tie<T>::create_fixed  (
 {
   return this->ptr_->create_fixed (
 digits,
-    scale,
-    ACE_TRY_ENV
+    scale
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::ComponentRepository_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -299,8 +299,8 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -309,8 +309,8 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -320,8 +320,8 @@ CORBA_ContainedSeq * POA_IR::ComponentRepository_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -329,8 +329,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -339,8 +339,8 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentRepository_tie<T>::describe_c
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -348,8 +348,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -358,8 +358,8 @@ CORBA_ModuleDef_ptr POA_IR::ComponentRepository_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -369,8 +369,8 @@ CORBA_ConstantDef_ptr POA_IR::ComponentRepository_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -381,8 +381,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -391,8 +391,8 @@ CORBA_StructDef_ptr POA_IR::ComponentRepository_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -402,8 +402,8 @@ CORBA_StructDef_ptr POA_IR::ComponentRepository_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -413,8 +413,8 @@ CORBA_UnionDef_ptr POA_IR::ComponentRepository_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -425,8 +425,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -435,8 +435,8 @@ CORBA_EnumDef_ptr POA_IR::ComponentRepository_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -446,8 +446,8 @@ CORBA_EnumDef_ptr POA_IR::ComponentRepository_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -456,8 +456,8 @@ CORBA_AliasDef_ptr POA_IR::ComponentRepository_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -467,8 +467,8 @@ CORBA_AliasDef_ptr POA_IR::ComponentRepository_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -477,8 +477,8 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -488,8 +488,8 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -504,8 +504,8 @@ CORBA_ValueDef_ptr POA_IR::ComponentRepository_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -521,8 +521,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -531,8 +531,8 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentRepository_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -542,8 +542,8 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentRepository_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -552,8 +552,8 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentRepository_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -563,8 +563,8 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentRepository_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -572,8 +572,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -582,8 +582,8 @@ CORBA_NativeDef_ptr POA_IR::ComponentRepository_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -592,8 +592,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_abstra
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -603,8 +603,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_abstra
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -613,8 +613,8 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_local_int
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -624,63 +624,63 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentRepository_tie<T>::create_local_int
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ComponentRepository_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentRepository_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::ProvidesDef_tie<T>::ProvidesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ProvidesDef_tie<T>::ProvidesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ProvidesDef_tie<T>::ProvidesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ProvidesDef_tie<T>::ProvidesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -724,160 +724,160 @@ POA_IR::ProvidesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ProvidesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::ProvidesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ProvidesDef::_default_POA (ACE_TRY_ENV);
+  return this->ProvidesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef_ptr POA_IR::ProvidesDef_tie<T>::interface_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::ProvidesDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ProvidesDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::ProvidesDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::ProvidesDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -885,8 +885,8 @@ template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -895,63 +895,63 @@ void POA_IR::ProvidesDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ProvidesDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ProvidesDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::UsesDef_tie<T>::UsesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::UsesDef_tie<T>::UsesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::UsesDef_tie<T>::UsesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::UsesDef_tie<T>::UsesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -995,173 +995,173 @@ POA_IR::UsesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::UsesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::UsesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->UsesDef::_default_POA (ACE_TRY_ENV);
+  return this->UsesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef_ptr POA_IR::UsesDef_tie<T>::interface_type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->interface_type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::UsesDef_tie<T>::is_multiple  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_multiple (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::UsesDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::UsesDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::UsesDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::UsesDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1169,8 +1169,8 @@ template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1179,63 +1179,63 @@ void POA_IR::UsesDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::UsesDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::UsesDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::EventDef_tie<T>::EventDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EventDef_tie<T>::EventDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EventDef_tie<T>::EventDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EventDef_tie<T>::EventDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1279,175 +1279,175 @@ POA_IR::EventDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::EventDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::EventDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->EventDef::_default_POA (ACE_TRY_ENV);
+  return this->EventDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::EventDef_tie<T>::is_a  (
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-event_id,
-    ACE_TRY_ENV
+event_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::EventDef_tie<T>::event  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::EventDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EventDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::EventDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::EventDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1455,8 +1455,8 @@ template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1465,63 +1465,63 @@ void POA_IR::EventDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::EventDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EventDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::EmitsDef_tie<T>::EmitsDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EmitsDef_tie<T>::EmitsDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EmitsDef_tie<T>::EmitsDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::EmitsDef_tie<T>::EmitsDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1565,175 +1565,175 @@ POA_IR::EmitsDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::EmitsDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::EmitsDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->EmitsDef::_default_POA (ACE_TRY_ENV);
+  return this->EmitsDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::EmitsDef_tie<T>::is_a  (
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-event_id,
-    ACE_TRY_ENV
+event_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::EmitsDef_tie<T>::event  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::EmitsDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::EmitsDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::EmitsDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::EmitsDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1741,8 +1741,8 @@ template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1751,63 +1751,63 @@ void POA_IR::EmitsDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::EmitsDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::EmitsDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::PublishesDef_tie<T>::PublishesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PublishesDef_tie<T>::PublishesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PublishesDef_tie<T>::PublishesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PublishesDef_tie<T>::PublishesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1851,175 +1851,175 @@ POA_IR::PublishesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::PublishesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::PublishesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->PublishesDef::_default_POA (ACE_TRY_ENV);
+  return this->PublishesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::PublishesDef_tie<T>::is_a  (
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-event_id,
-    ACE_TRY_ENV
+event_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::PublishesDef_tie<T>::event  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::PublishesDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PublishesDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::PublishesDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::PublishesDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2027,8 +2027,8 @@ template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2037,63 +2037,63 @@ void POA_IR::PublishesDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::PublishesDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PublishesDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::ConsumesDef_tie<T>::ConsumesDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ConsumesDef_tie<T>::ConsumesDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ConsumesDef_tie<T>::ConsumesDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ConsumesDef_tie<T>::ConsumesDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -2137,175 +2137,175 @@ POA_IR::ConsumesDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ConsumesDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::ConsumesDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ConsumesDef::_default_POA (ACE_TRY_ENV);
+  return this->ConsumesDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::ConsumesDef_tie<T>::is_a  (
-    const char * event_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * event_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-event_id,
-    ACE_TRY_ENV
+event_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::ConsumesDef_tie<T>::event  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->event (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::ConsumesDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ConsumesDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::ConsumesDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::ConsumesDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2313,8 +2313,8 @@ template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2323,63 +2323,63 @@ void POA_IR::ConsumesDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ConsumesDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ConsumesDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::ComponentDef_tie<T>::ComponentDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentDef_tie<T>::ComponentDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentDef_tie<T>::ComponentDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::ComponentDef_tie<T>::ComponentDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -2423,130 +2423,130 @@ POA_IR::ComponentDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::ComponentDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::ComponentDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->ComponentDef::_default_POA (ACE_TRY_ENV);
+  return this->ComponentDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::supported_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::supported_interfaces  (
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->supported_interfaces (
-supported_interfaces,
-    ACE_TRY_ENV
+supported_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ComponentDef_ptr POA_IR::ComponentDef_tie<T>::base_component  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_component (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ProvidesDefSeq * POA_IR::ComponentDef_tie<T>::provides_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->provides_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::UsesDefSeq * POA_IR::ComponentDef_tie<T>::uses_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->uses_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::EmitsDefSeq * POA_IR::ComponentDef_tie<T>::emits_events  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->emits_events (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::PublishesDefSeq * POA_IR::ComponentDef_tie<T>::publishes_events  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->publishes_events (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ConsumesDefSeq * POA_IR::ComponentDef_tie<T>::consumes_events  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->consumes_events (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_basic  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_basic (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2555,8 +2555,8 @@ IR::ProvidesDef_ptr POA_IR::ComponentDef_tie<T>::create_provides  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_InterfaceDef_ptr interface_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2566,8 +2566,8 @@ IR::ProvidesDef_ptr POA_IR::ComponentDef_tie<T>::create_provides  (
 id,
     name,
     version,
-    interface_type,
-    ACE_TRY_ENV
+    interface_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2577,8 +2577,8 @@ IR::UsesDef_ptr POA_IR::ComponentDef_tie<T>::create_uses  (
     const char * name,
     const char * version,
     CORBA_InterfaceDef_ptr interface_type,
-    CORBA::Boolean is_multiple,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_multiple
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2589,8 +2589,8 @@ id,
     name,
     version,
     interface_type,
-    is_multiple,
-    ACE_TRY_ENV
+    is_multiple
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2599,8 +2599,8 @@ IR::EmitsDef_ptr POA_IR::ComponentDef_tie<T>::create_emits  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2610,8 +2610,8 @@ IR::EmitsDef_ptr POA_IR::ComponentDef_tie<T>::create_emits  (
 id,
     name,
     version,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2620,8 +2620,8 @@ IR::PublishesDef_ptr POA_IR::ComponentDef_tie<T>::create_publishes  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2631,8 +2631,8 @@ IR::PublishesDef_ptr POA_IR::ComponentDef_tie<T>::create_publishes  (
 id,
     name,
     version,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2641,8 +2641,8 @@ IR::ConsumesDef_ptr POA_IR::ComponentDef_tie<T>::create_consumes  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2652,64 +2652,64 @@ IR::ConsumesDef_ptr POA_IR::ComponentDef_tie<T>::create_consumes  (
 id,
     name,
     version,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_IR::ComponentDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::ComponentDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::ComponentDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -2719,8 +2719,8 @@ CORBA_AttributeDef_ptr POA_IR::ComponentDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2731,8 +2731,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2745,8 +2745,8 @@ CORBA_OperationDef_ptr POA_IR::ComponentDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2760,31 +2760,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::ComponentDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2792,8 +2792,8 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2802,8 +2802,8 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2813,8 +2813,8 @@ CORBA_ContainedSeq * POA_IR::ComponentDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2822,8 +2822,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2832,8 +2832,8 @@ CORBA_Container::DescriptionSeq * POA_IR::ComponentDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2841,8 +2841,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2851,8 +2851,8 @@ CORBA_ModuleDef_ptr POA_IR::ComponentDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2862,8 +2862,8 @@ CORBA_ConstantDef_ptr POA_IR::ComponentDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2874,8 +2874,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2884,8 +2884,8 @@ CORBA_StructDef_ptr POA_IR::ComponentDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2895,8 +2895,8 @@ CORBA_StructDef_ptr POA_IR::ComponentDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2906,8 +2906,8 @@ CORBA_UnionDef_ptr POA_IR::ComponentDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2918,8 +2918,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2928,8 +2928,8 @@ CORBA_EnumDef_ptr POA_IR::ComponentDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2939,8 +2939,8 @@ CORBA_EnumDef_ptr POA_IR::ComponentDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2949,8 +2949,8 @@ CORBA_AliasDef_ptr POA_IR::ComponentDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2960,8 +2960,8 @@ CORBA_AliasDef_ptr POA_IR::ComponentDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2970,8 +2970,8 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2981,8 +2981,8 @@ CORBA_InterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -2997,8 +2997,8 @@ CORBA_ValueDef_ptr POA_IR::ComponentDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3014,8 +3014,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3024,8 +3024,8 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3035,8 +3035,8 @@ CORBA_ValueBoxDef_ptr POA_IR::ComponentDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3045,8 +3045,8 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3056,8 +3056,8 @@ CORBA_ExceptionDef_ptr POA_IR::ComponentDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3065,8 +3065,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3075,8 +3075,8 @@ CORBA_NativeDef_ptr POA_IR::ComponentDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3085,8 +3085,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_abstract_inte
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3096,8 +3096,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_abstract_inte
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -3106,8 +3106,8 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_local_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3117,144 +3117,144 @@ CORBA_LocalInterfaceDef_ptr POA_IR::ComponentDef_tie<T>::create_local_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::ComponentDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::ComponentDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::ComponentDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::ComponentDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3262,8 +3262,8 @@ template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3272,76 +3272,76 @@ void POA_IR::ComponentDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::ComponentDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::ComponentDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::ComponentDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::PrimaryKeyDef_tie<T>::PrimaryKeyDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PrimaryKeyDef_tie<T>::PrimaryKeyDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PrimaryKeyDef_tie<T>::PrimaryKeyDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::PrimaryKeyDef_tie<T>::PrimaryKeyDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3385,175 +3385,175 @@ POA_IR::PrimaryKeyDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::PrimaryKeyDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::PrimaryKeyDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->PrimaryKeyDef::_default_POA (ACE_TRY_ENV);
+  return this->PrimaryKeyDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::PrimaryKeyDef_tie<T>::is_a  (
-    const char * primary_key_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * primary_key_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-primary_key_id,
-    ACE_TRY_ENV
+primary_key_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_IR::PrimaryKeyDef_tie<T>::primary_key  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->primary_key (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::PrimaryKeyDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::PrimaryKeyDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::PrimaryKeyDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::PrimaryKeyDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3561,8 +3561,8 @@ template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3571,63 +3571,63 @@ void POA_IR::PrimaryKeyDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::PrimaryKeyDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::PrimaryKeyDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::FactoryDef_tie<T>::FactoryDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FactoryDef_tie<T>::FactoryDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FactoryDef_tie<T>::FactoryDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FactoryDef_tie<T>::FactoryDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -3671,300 +3671,300 @@ POA_IR::FactoryDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::FactoryDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::FactoryDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->FactoryDef::_default_POA (ACE_TRY_ENV);
+  return this->FactoryDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::FactoryDef_tie<T>::result  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_IR::FactoryDef_tie<T>::result_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::result_def  (
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->result_def (
-result_def,
-    ACE_TRY_ENV
+result_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ParDescriptionSeq * POA_IR::FactoryDef_tie<T>::params  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::params  (
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->params (
-params,
-    ACE_TRY_ENV
+params
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::OperationMode POA_IR::FactoryDef_tie<T>::mode  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::mode  (
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::OperationMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->mode (
-mode,
-    ACE_TRY_ENV
+mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContextIdSeq * POA_IR::FactoryDef_tie<T>::contexts  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::contexts  (
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->contexts (
-contexts,
-    ACE_TRY_ENV
+contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ExceptionDefSeq * POA_IR::FactoryDef_tie<T>::exceptions  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::exceptions  (
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->exceptions (
-exceptions,
-    ACE_TRY_ENV
+exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::FactoryDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FactoryDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::FactoryDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::FactoryDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -3972,8 +3972,8 @@ template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -3982,63 +3982,63 @@ void POA_IR::FactoryDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::FactoryDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FactoryDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::FinderDef_tie<T>::FinderDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FinderDef_tie<T>::FinderDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FinderDef_tie<T>::FinderDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::FinderDef_tie<T>::FinderDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4082,300 +4082,300 @@ POA_IR::FinderDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::FinderDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::FinderDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->FinderDef::_default_POA (ACE_TRY_ENV);
+  return this->FinderDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::FinderDef_tie<T>::result  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_IR::FinderDef_tie<T>::result_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->result_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::result_def  (
-    CORBA_IDLType_ptr result_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr result_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->result_def (
-result_def,
-    ACE_TRY_ENV
+result_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ParDescriptionSeq * POA_IR::FinderDef_tie<T>::params  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->params (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::params  (
-    const CORBA_ParDescriptionSeq & params,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ParDescriptionSeq & params
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->params (
-params,
-    ACE_TRY_ENV
+params
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::OperationMode POA_IR::FinderDef_tie<T>::mode  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->mode (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::mode  (
-    CORBA::OperationMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::OperationMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->mode (
-mode,
-    ACE_TRY_ENV
+mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContextIdSeq * POA_IR::FinderDef_tie<T>::contexts  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->contexts (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::contexts  (
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->contexts (
-contexts,
-    ACE_TRY_ENV
+contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ExceptionDefSeq * POA_IR::FinderDef_tie<T>::exceptions  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->exceptions (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::exceptions  (
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->exceptions (
-exceptions,
-    ACE_TRY_ENV
+exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::FinderDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::FinderDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::FinderDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::FinderDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4383,8 +4383,8 @@ template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4393,63 +4393,63 @@ void POA_IR::FinderDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::FinderDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::FinderDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_IR::HomeDef_tie<T>::HomeDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::HomeDef_tie<T>::HomeDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::HomeDef_tie<T>::HomeDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_IR::HomeDef_tie<T>::HomeDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -4493,89 +4493,89 @@ POA_IR::HomeDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_IR::HomeDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_IR::HomeDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->HomeDef::_default_POA (ACE_TRY_ENV);
+  return this->HomeDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 IR::HomeDef_ptr POA_IR::HomeDef_tie<T>::base_home  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_home (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::ComponentDef_ptr POA_IR::HomeDef_tie<T>::managed_component  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->managed_component (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::primary_key  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->primary_key (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::FactoryDefSeq * POA_IR::HomeDef_tie<T>::factories  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->factories (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 IR::FinderDefSeq * POA_IR::HomeDef_tie<T>::finders  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->finders (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::HomeDef_tie<T>::is_basic  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_basic (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4584,8 +4584,8 @@ IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::create_primary_key  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_ValueDef_ptr primary_key,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr primary_key
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4595,8 +4595,8 @@ IR::PrimaryKeyDef_ptr POA_IR::HomeDef_tie<T>::create_primary_key  (
 id,
     name,
     version,
-    primary_key,
-    ACE_TRY_ENV
+    primary_key
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4606,8 +4606,8 @@ IR::FactoryDef_ptr POA_IR::HomeDef_tie<T>::create_factory  (
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4618,8 +4618,8 @@ id,
     name,
     version,
     params,
-    exceptions,
-    ACE_TRY_ENV
+    exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4629,8 +4629,8 @@ IR::FinderDef_ptr POA_IR::HomeDef_tie<T>::create_finder  (
     const char * name,
     const char * version,
     const CORBA_ParDescriptionSeq & params,
-    const CORBA_ExceptionDefSeq & exceptions,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ExceptionDefSeq & exceptions
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4641,64 +4641,64 @@ id,
     name,
     version,
     params,
-    exceptions,
-    ACE_TRY_ENV
+    exceptions
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_IR::HomeDef_tie<T>::base_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::base_interfaces  (
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_interfaces (
-base_interfaces,
-    ACE_TRY_ENV
+base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_IR::HomeDef_tie<T>::is_a  (
-    const char * interface_id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * interface_id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-interface_id,
-    ACE_TRY_ENV
+interface_id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDef::FullInterfaceDescription * POA_IR::HomeDef_tie<T>::describe_interface  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_interface (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -4708,8 +4708,8 @@ CORBA_AttributeDef_ptr POA_IR::HomeDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4720,8 +4720,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4734,8 +4734,8 @@ CORBA_OperationDef_ptr POA_IR::HomeDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4749,31 +4749,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_IR::HomeDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4781,8 +4781,8 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4791,8 +4791,8 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4802,8 +4802,8 @@ CORBA_ContainedSeq * POA_IR::HomeDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4811,8 +4811,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4821,8 +4821,8 @@ CORBA_Container::DescriptionSeq * POA_IR::HomeDef_tie<T>::describe_contents  (
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4830,8 +4830,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4840,8 +4840,8 @@ CORBA_ModuleDef_ptr POA_IR::HomeDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4851,8 +4851,8 @@ CORBA_ConstantDef_ptr POA_IR::HomeDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4863,8 +4863,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4873,8 +4873,8 @@ CORBA_StructDef_ptr POA_IR::HomeDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4884,8 +4884,8 @@ CORBA_StructDef_ptr POA_IR::HomeDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4895,8 +4895,8 @@ CORBA_UnionDef_ptr POA_IR::HomeDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4907,8 +4907,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4917,8 +4917,8 @@ CORBA_EnumDef_ptr POA_IR::HomeDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4928,8 +4928,8 @@ CORBA_EnumDef_ptr POA_IR::HomeDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4938,8 +4938,8 @@ CORBA_AliasDef_ptr POA_IR::HomeDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4949,8 +4949,8 @@ CORBA_AliasDef_ptr POA_IR::HomeDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4959,8 +4959,8 @@ CORBA_InterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -4970,8 +4970,8 @@ CORBA_InterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -4986,8 +4986,8 @@ CORBA_ValueDef_ptr POA_IR::HomeDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5003,8 +5003,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5013,8 +5013,8 @@ CORBA_ValueBoxDef_ptr POA_IR::HomeDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5024,8 +5024,8 @@ CORBA_ValueBoxDef_ptr POA_IR::HomeDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5034,8 +5034,8 @@ CORBA_ExceptionDef_ptr POA_IR::HomeDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5045,8 +5045,8 @@ CORBA_ExceptionDef_ptr POA_IR::HomeDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5054,8 +5054,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5064,8 +5064,8 @@ CORBA_NativeDef_ptr POA_IR::HomeDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5074,8 +5074,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_abstract_interface
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5085,8 +5085,8 @@ CORBA_AbstractInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_abstract_interface
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -5095,8 +5095,8 @@ CORBA_LocalInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5106,144 +5106,144 @@ CORBA_LocalInterfaceDef_ptr POA_IR::HomeDef_tie<T>::create_local_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_IR::HomeDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_IR::HomeDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_IR::HomeDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_IR::HomeDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -5251,8 +5251,8 @@ template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5261,47 +5261,47 @@ void POA_IR::HomeDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_IR::HomeDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_IR::HomeDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_IR::HomeDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
index 95f1ac1f017..60601af3a69 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.cpp
@@ -185,36 +185,32 @@ public:
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::UShort result);
@@ -231,45 +227,45 @@ private:
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::TAO_ServerRequestInfo_CORBA_FixedDef_digits_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_FixedDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_FixedDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -281,7 +277,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -290,11 +286,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -311,36 +307,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
     ,
-    const CORBA::UShort & digits,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::UShort & digits
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -358,8 +350,8 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_FixedDef *tao_impl,
-    const CORBA::UShort & digits,
-    CORBA::Environment &
+    const CORBA::UShort & digits
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -367,12 +359,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::TAO_ServerRequestInfo_CORBA_Fix
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -388,25 +380,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::arguments (CORBA::Environment &
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -414,7 +406,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::result (CORBA::Environment &ACE
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -423,11 +415,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_digits_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_FixedDef_scale_get : public TAO_ServerRequestInfo
@@ -436,36 +428,32 @@ public:
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Short result);
@@ -482,45 +470,45 @@ private:
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::TAO_ServerRequestInfo_CORBA_FixedDef_scale_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_FixedDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_FixedDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -532,7 +520,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -541,11 +529,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -562,36 +550,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_FixedDef *tao_impl
     ,
-    const CORBA::Short & scale,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -609,8 +593,8 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_FixedDef *tao_impl,
-    const CORBA::Short & scale,
-    CORBA::Environment &
+    const CORBA::Short & scale
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -618,12 +602,12 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::TAO_ServerRequestInfo_CORBA_Fixe
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -639,25 +623,25 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::arguments (CORBA::Environment &A
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -665,7 +649,7 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::result (CORBA::Environment &ACE_
 
 char *
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -674,11 +658,11 @@ TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_FixedDef_scale_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -710,18 +694,18 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::~_TAO_CORBA_FixedDef_Strategized_P
 
 _TAO_CORBA_FixedDef_Proxy_Impl&
 _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_FixedDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_FixedDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -730,8 +714,8 @@ _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_FixedDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -800,8 +784,8 @@ _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -816,8 +800,8 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "digits",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -826,14 +810,14 @@ CORBA::UShort _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::UShort digits,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::UShort digits
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -846,8 +830,8 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "digits",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -856,15 +840,15 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::digits (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->digits (
-        digits,
-        ACE_TRY_ENV
+        digits
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -879,8 +863,8 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "scale",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -889,14 +873,14 @@ CORBA::Short _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -909,8 +893,8 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "scale",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -919,8 +903,8 @@ void _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl::scale (
           "IDL:omg.org/CORBA/FixedDef:1.0"
         )
     )->scale (
-        scale,
-        ACE_TRY_ENV
+        scale
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -950,8 +934,8 @@ POA_CORBA_FixedDef::~POA_CORBA_FixedDef (void)
 void POA_CORBA_FixedDef::_get_digits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl =
@@ -971,19 +955,19 @@ void POA_CORBA_FixedDef::_get_digits_skel (
   TAO_ServerRequestInfo_CORBA_FixedDef_digits_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->digits (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -991,20 +975,20 @@ void POA_CORBA_FixedDef::_get_digits_skel (
       CORBA::UShort _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1026,16 +1010,13 @@ void POA_CORBA_FixedDef::_get_digits_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_FixedDef::_set_digits_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1063,39 +1044,39 @@ void POA_CORBA_FixedDef::_set_digits_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      digits,
-      ACE_TRY_ENV
+      digits
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->digits (
-          digits,
-          ACE_TRY_ENV
+          digits
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1110,16 +1091,13 @@ void POA_CORBA_FixedDef::_set_digits_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_FixedDef::_get_scale_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl =
@@ -1139,19 +1117,19 @@ void POA_CORBA_FixedDef::_get_scale_skel (
   TAO_ServerRequestInfo_CORBA_FixedDef_scale_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->scale (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -1159,20 +1137,20 @@ void POA_CORBA_FixedDef::_get_scale_skel (
       CORBA::Short _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1194,16 +1172,13 @@ void POA_CORBA_FixedDef::_get_scale_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_FixedDef::_set_scale_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1231,39 +1206,39 @@ void POA_CORBA_FixedDef::_set_scale_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      scale,
-      ACE_TRY_ENV
+      scale
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->scale (
-          scale,
-          ACE_TRY_ENV
+          scale
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -1278,16 +1253,13 @@ void POA_CORBA_FixedDef::_set_scale_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_FixedDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -1297,7 +1269,7 @@ void POA_CORBA_FixedDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1309,12 +1281,12 @@ void POA_CORBA_FixedDef::_is_a_skel (
 void POA_CORBA_FixedDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -1326,8 +1298,8 @@ void POA_CORBA_FixedDef::_non_existent_skel (
 void POA_CORBA_FixedDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_FixedDef *_tao_impl = (POA_CORBA_FixedDef *) _tao_object_reference;
@@ -1346,7 +1318,7 @@ void POA_CORBA_FixedDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -1372,11 +1344,11 @@ void POA_CORBA_FixedDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_FixedDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -1404,12 +1376,12 @@ void* POA_CORBA_FixedDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_FixedDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -1419,9 +1391,9 @@ const char* POA_CORBA_FixedDef::_interface_repository_id (void) const
 }
 
 CORBA_FixedDef*
-POA_CORBA_FixedDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_FixedDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -1591,36 +1563,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::TypeCode_ptr result);
@@ -1637,45 +1605,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueMemberDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueMemberDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1687,7 +1655,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1696,11 +1664,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1716,36 +1684,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -1762,45 +1726,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueMemberDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueMemberDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -1812,7 +1776,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1821,11 +1785,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -1842,36 +1806,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
     ,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -1889,8 +1849,8 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueMemberDef *tao_impl,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -1898,12 +1858,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -1919,25 +1879,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -1945,7 +1905,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -1954,11 +1914,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get : public TAO_ServerRequestInfo
@@ -1967,36 +1927,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Visibility result);
@@ -2013,45 +1969,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueMemberDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueMemberDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -2063,7 +2019,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2072,11 +2028,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -2093,36 +2049,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueMemberDef *tao_impl
     ,
-    const CORBA::Visibility & access,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Visibility & access
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -2140,8 +2092,8 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueMemberDef *tao_impl,
-    const CORBA::Visibility & access,
-    CORBA::Environment &
+    const CORBA::Visibility & access
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -2149,12 +2101,12 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -2170,25 +2122,25 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -2196,7 +2148,7 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -2205,11 +2157,11 @@ TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -2241,18 +2193,18 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueMemberDef_S
 
 _TAO_CORBA_ValueMemberDef_Proxy_Impl&
 _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ValueMemberDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ValueMemberDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -2261,8 +2213,8 @@ _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -2331,8 +2283,8 @@ _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueMemberDef_ThruPOA_
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2347,8 +2299,8 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2357,13 +2309,13 @@ CORBA::TypeCode_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2378,8 +2330,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -2388,14 +2340,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2408,8 +2360,8 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2418,15 +2370,15 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::type_def (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->type_def (
-        type_def,
-        ACE_TRY_ENV
+        type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2441,8 +2393,8 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "access",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -2451,14 +2403,14 @@ CORBA::Visibility _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Visibility access
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -2471,8 +2423,8 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "access",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -2481,8 +2433,8 @@ void _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl::access (
           "IDL:omg.org/CORBA/ValueMemberDef:1.0"
         )
     )->access (
-        access,
-        ACE_TRY_ENV
+        access
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -2512,8 +2464,8 @@ POA_CORBA_ValueMemberDef::~POA_CORBA_ValueMemberDef (void)
 void POA_CORBA_ValueMemberDef::_get_type_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl =
@@ -2533,19 +2485,19 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2554,20 +2506,20 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2589,16 +2541,13 @@ void POA_CORBA_ValueMemberDef::_get_type_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_get_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl =
@@ -2618,19 +2567,19 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2639,20 +2588,20 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2674,16 +2623,13 @@ void POA_CORBA_ValueMemberDef::_get_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_set_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2711,39 +2657,39 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      type_def.in (),
-      ACE_TRY_ENV
+      type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->type_def (
-          type_def.in (),
-          ACE_TRY_ENV
+          type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2758,16 +2704,13 @@ void POA_CORBA_ValueMemberDef::_set_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_get_access_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl =
@@ -2787,19 +2730,19 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
   TAO_ServerRequestInfo_CORBA_ValueMemberDef_access_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->access (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -2807,20 +2750,20 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
       CORBA::Visibility _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2842,16 +2785,13 @@ void POA_CORBA_ValueMemberDef::_get_access_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_set_access_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2879,39 +2819,39 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      access,
-      ACE_TRY_ENV
+      access
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->access (
-          access,
-          ACE_TRY_ENV
+          access
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -2926,16 +2866,13 @@ void POA_CORBA_ValueMemberDef::_set_access_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueMemberDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -2945,7 +2882,7 @@ void POA_CORBA_ValueMemberDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2957,12 +2894,12 @@ void POA_CORBA_ValueMemberDef::_is_a_skel (
 void POA_CORBA_ValueMemberDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -2974,8 +2911,8 @@ void POA_CORBA_ValueMemberDef::_non_existent_skel (
 void POA_CORBA_ValueMemberDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueMemberDef *_tao_impl = (POA_CORBA_ValueMemberDef *) _tao_object_reference;
@@ -2994,7 +2931,7 @@ void POA_CORBA_ValueMemberDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -3020,11 +2957,11 @@ void POA_CORBA_ValueMemberDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ValueMemberDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -3052,12 +2989,12 @@ void* POA_CORBA_ValueMemberDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ValueMemberDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -3067,9 +3004,9 @@ const char* POA_CORBA_ValueMemberDef::_interface_repository_id (void) const
 }
 
 CORBA_ValueMemberDef*
-POA_CORBA_ValueMemberDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ValueMemberDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -3275,36 +3212,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InterfaceDefSeq * result);
@@ -3321,45 +3254,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3371,7 +3304,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3380,11 +3313,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3401,36 +3334,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3448,8 +3377,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3457,12 +3386,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3478,25 +3407,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3504,7 +3433,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3513,11 +3442,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get : public TAO_ServerRequestInfo
@@ -3526,36 +3455,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_InitializerSeq * result);
@@ -3572,45 +3497,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3622,7 +3547,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3631,11 +3556,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3652,36 +3577,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3699,8 +3620,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3708,12 +3629,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3729,25 +3650,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -3755,7 +3676,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3764,11 +3685,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_initializers_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get : public TAO_ServerRequestInfo
@@ -3777,36 +3698,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef_ptr result);
@@ -3823,45 +3740,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -3873,7 +3790,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -3882,11 +3799,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -3903,36 +3820,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_ValueDef_ptr base_value
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -3950,8 +3863,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &
+    CORBA_ValueDef_ptr base_value
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -3959,12 +3872,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::TAO_ServerRequestInfo_CORBA
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -3980,25 +3893,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::arguments (CORBA::Environme
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4006,7 +3919,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4015,11 +3928,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_base_value_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get : public TAO_ServerRequestInfo
@@ -4028,36 +3941,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDefSeq * result);
@@ -4074,45 +3983,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4124,7 +4033,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4133,11 +4042,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4154,36 +4063,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ValueDefSeq & abstract_base_values
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4201,8 +4106,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &
+    const CORBA_ValueDefSeq & abstract_base_values
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4210,12 +4115,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4231,25 +4136,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4257,7 +4162,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4266,11 +4171,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get : public TAO_ServerRequestInfo
@@ -4279,36 +4184,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4325,45 +4226,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4375,7 +4276,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4384,11 +4285,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4405,36 +4306,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA::Boolean & is_abstract,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & is_abstract
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4452,8 +4349,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA::Boolean & is_abstract,
-    CORBA::Environment &
+    const CORBA::Boolean & is_abstract
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4461,12 +4358,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::TAO_ServerRequestInfo_CORB
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4482,25 +4379,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::arguments (CORBA::Environm
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4508,7 +4405,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4517,11 +4414,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_most_derived_interf
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get : public TAO_ServerRequestInfo
@@ -4530,36 +4427,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4576,45 +4469,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4626,7 +4519,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4635,11 +4528,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4656,36 +4549,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA::Boolean & is_custom,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & is_custom
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4703,8 +4592,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA::Boolean & is_custom,
-    CORBA::Environment &
+    const CORBA::Boolean & is_custom
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4712,12 +4601,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::TAO_ServerRequestInfo_CORBA_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4733,25 +4622,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::arguments (CORBA::Environmen
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -4759,7 +4648,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::result (CORBA::Environment &
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4768,11 +4657,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_most_derived_interfac
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get : public TAO_ServerRequestInfo
@@ -4781,36 +4670,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -4827,45 +4712,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -4877,7 +4762,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -4886,11 +4771,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -4907,36 +4792,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const CORBA::Boolean & is_truncatable,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Boolean & is_truncatable
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -4954,8 +4835,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const CORBA::Boolean & is_truncatable,
-    CORBA::Environment &
+    const CORBA::Boolean & is_truncatable
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -4963,12 +4844,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::TAO_ServerRequestInfo_C
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -4984,25 +4865,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::arguments (CORBA::Envir
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -5010,7 +4891,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::result (CORBA::Environm
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5019,11 +4900,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_most_derived_int
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 class TAO_ServerRequestInfo_CORBA_ValueDef_is_a : public TAO_ServerRequestInfo
@@ -5033,36 +4914,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
     ,
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const char * id
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA::Boolean result);
@@ -5081,8 +4958,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueDef *tao_impl,
-    const char * id,
-    CORBA::Environment &
+    const char * id
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5090,12 +4967,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::TAO_ServerRequestInfo_CORBA_ValueDef_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5111,25 +4988,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::arguments (CORBA::Environment &ACE_TR
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_a::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5141,7 +5018,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::result (CORBA::Environment &ACE_TRY_E
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5150,11 +5027,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_most_derived_interface (
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_is_a::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5170,36 +5047,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueDef::FullValueDescription * result);
@@ -5216,45 +5089,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::TAO_ServerRequestInfo_CORBA_ValueDef_describe_value (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5266,7 +5139,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::result (CORBA::Environment
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5275,11 +5148,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_most_derived_interfa
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_describe_value::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5300,36 +5173,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Visibility & access,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA::Visibility & access
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_ValueMemberDef_ptr result);
@@ -5356,8 +5225,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Visibility & access,
-    CORBA::Environment &
+    const CORBA::Visibility & access
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5369,12 +5238,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::TAO_ServerRequestInfo_
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5402,25 +5271,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::arguments (CORBA::Envi
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5432,7 +5301,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::result (CORBA::Environ
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5441,11 +5310,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_most_derived_in
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_create_value_member::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5466,36 +5335,32 @@ public:
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_AttributeDef_ptr result);
@@ -5522,8 +5387,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode & mode,
-    CORBA::Environment &
+    CORBA::AttributeMode & mode
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5535,12 +5400,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5568,25 +5433,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5598,7 +5463,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5607,11 +5472,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_create_attribute::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5635,36 +5500,32 @@ public:
     CORBA::OperationMode & mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_OperationDef_ptr result);
@@ -5697,8 +5558,8 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR
     CORBA::OperationMode & mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -5713,12 +5574,12 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::TAO_ServerRequestInfo_COR
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -5755,25 +5616,25 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::arguments (CORBA::Environ
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -5785,7 +5646,7 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::result (CORBA::Environmen
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -5794,11 +5655,11 @@ TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_most_derived_inter
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueDef_create_operation::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -5837,18 +5698,18 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueDef_Strategized_P
 
 _TAO_CORBA_ValueDef_Proxy_Impl&
 _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ValueDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ValueDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -5857,8 +5718,8 @@ _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ValueDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -5927,8 +5788,8 @@ _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5943,8 +5804,8 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -5953,14 +5814,14 @@ CORBA_InterfaceDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interf
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -5973,8 +5834,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "supported_interfaces",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -5983,15 +5844,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::supported_interfaces (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->supported_interfaces (
-        supported_interfaces,
-        ACE_TRY_ENV
+        supported_interfaces
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6006,8 +5867,8 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "initializers",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6016,14 +5877,14 @@ CORBA_InitializerSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6036,8 +5897,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "initializers",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6046,15 +5907,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::initializers (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->initializers (
-        initializers,
-        ACE_TRY_ENV
+        initializers
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6069,8 +5930,8 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6079,14 +5940,14 @@ CORBA_ValueDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr base_value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6099,8 +5960,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "base_value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6109,15 +5970,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::base_value (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->base_value (
-        base_value,
-        ACE_TRY_ENV
+        base_value
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6132,8 +5993,8 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "abstract_base_values",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6142,14 +6003,14 @@ CORBA_ValueDefSeq * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
     CORBA_Object *_collocated_tao_target_,
-    const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ValueDefSeq & abstract_base_values
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6162,8 +6023,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "abstract_base_values",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6172,15 +6033,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::abstract_base_values (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->abstract_base_values (
-        abstract_base_values,
-        ACE_TRY_ENV
+        abstract_base_values
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6195,8 +6056,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_abstract",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6205,14 +6066,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Boolean is_abstract,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_abstract
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6225,8 +6086,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_abstract",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6235,15 +6096,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_abstract (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_abstract (
-        is_abstract,
-        ACE_TRY_ENV
+        is_abstract
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6258,8 +6119,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_custom",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6268,14 +6129,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Boolean is_custom,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_custom
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6288,8 +6149,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_custom",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6298,15 +6159,15 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_custom (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_custom (
-        is_custom,
-        ACE_TRY_ENV
+        is_custom
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6321,8 +6182,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_truncatable",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6331,14 +6192,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
     CORBA_Object *_collocated_tao_target_,
-    CORBA::Boolean is_truncatable,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_truncatable
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6351,8 +6212,8 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_truncatable",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -6361,16 +6222,16 @@ void _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_truncatable (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_truncatable (
-        is_truncatable,
-        ACE_TRY_ENV
+        is_truncatable
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
 
 CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
     CORBA_Object *_collocated_tao_target_,
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6385,8 +6246,8 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "is_a",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN  (_tao_retval);
     return ACE_reinterpret_cast (
@@ -6395,14 +6256,14 @@ CORBA::Boolean _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::is_a (
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->is_a (
-        id,
-        ACE_TRY_ENV
+        id
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
 CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::describe_value (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6417,8 +6278,8 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "describe_value",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6427,7 +6288,7 @@ CORBA_ValueDef::FullValueDescription * _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::d
           "IDL:omg.org/CORBA/ValueDef:1.0"
         )
     )->describe_value (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
@@ -6437,8 +6298,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Visibility access
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6453,8 +6314,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_value_member",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6467,8 +6328,8 @@ CORBA_ValueMemberDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_value_me
         name,
         version,
         type,
-        access,
-        ACE_TRY_ENV
+        access
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -6478,8 +6339,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6494,8 +6355,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_attribute",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6508,8 +6369,8 @@ CORBA_AttributeDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_attribute
         name,
         version,
         type,
-        mode,
-        ACE_TRY_ENV
+        mode
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -6522,8 +6383,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -6538,8 +6399,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "create_operation",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -6555,8 +6416,8 @@ CORBA_OperationDef_ptr _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl::create_operation
         mode,
         params,
         exceptions,
-        contexts,
-        ACE_TRY_ENV
+        contexts
+        TAO_ENV_ARG_PARAMETER
       );
 }
 
@@ -6587,8 +6448,8 @@ POA_CORBA_ValueDef::~POA_CORBA_ValueDef (void)
 void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6608,19 +6469,19 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_supported_interfaces_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->supported_interfaces (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6629,20 +6490,20 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6664,16 +6525,13 @@ void POA_CORBA_ValueDef::_get_supported_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -6701,39 +6559,39 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      supported_interfaces,
-      ACE_TRY_ENV
+      supported_interfaces
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->supported_interfaces (
-          supported_interfaces,
-          ACE_TRY_ENV
+          supported_interfaces
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6748,16 +6606,13 @@ void POA_CORBA_ValueDef::_set_supported_interfaces_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6777,19 +6632,19 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_initializers_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->initializers (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6798,20 +6653,20 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6833,16 +6688,13 @@ void POA_CORBA_ValueDef::_get_initializers_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_initializers_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -6870,39 +6722,39 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      initializers,
-      ACE_TRY_ENV
+      initializers
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->initializers (
-          initializers,
-          ACE_TRY_ENV
+          initializers
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -6917,16 +6769,13 @@ void POA_CORBA_ValueDef::_set_initializers_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -6946,19 +6795,19 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_base_value_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->base_value (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -6967,20 +6816,20 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7002,16 +6851,13 @@ void POA_CORBA_ValueDef::_get_base_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_base_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7039,39 +6885,39 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      base_value.in (),
-      ACE_TRY_ENV
+      base_value.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->base_value (
-          base_value.in (),
-          ACE_TRY_ENV
+          base_value.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7086,16 +6932,13 @@ void POA_CORBA_ValueDef::_set_base_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7115,19 +6958,19 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_abstract_base_values_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->abstract_base_values (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7136,20 +6979,20 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7171,16 +7014,13 @@ void POA_CORBA_ValueDef::_get_abstract_base_values_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7208,39 +7048,39 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      abstract_base_values,
-      ACE_TRY_ENV
+      abstract_base_values
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->abstract_base_values (
-          abstract_base_values,
-          ACE_TRY_ENV
+          abstract_base_values
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7255,16 +7095,13 @@ void POA_CORBA_ValueDef::_set_abstract_base_values_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7284,19 +7121,19 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_is_abstract_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_abstract (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7304,20 +7141,20 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7339,16 +7176,13 @@ void POA_CORBA_ValueDef::_get_is_abstract_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_is_abstract_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7376,39 +7210,39 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      is_abstract,
-      ACE_TRY_ENV
+      is_abstract
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->is_abstract (
-          is_abstract,
-          ACE_TRY_ENV
+          is_abstract
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7423,16 +7257,13 @@ void POA_CORBA_ValueDef::_set_is_abstract_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7452,19 +7283,19 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_is_custom_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_custom (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7472,20 +7303,20 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7507,16 +7338,13 @@ void POA_CORBA_ValueDef::_get_is_custom_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_is_custom_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7544,39 +7372,39 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      is_custom,
-      ACE_TRY_ENV
+      is_custom
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->is_custom (
-          is_custom,
-          ACE_TRY_ENV
+          is_custom
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7591,16 +7419,13 @@ void POA_CORBA_ValueDef::_set_is_custom_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_get_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7620,19 +7445,19 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_is_truncatable_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_truncatable (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7640,20 +7465,20 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7675,16 +7500,13 @@ void POA_CORBA_ValueDef::_get_is_truncatable_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_set_is_truncatable_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7712,39 +7534,39 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      is_truncatable,
-      ACE_TRY_ENV
+      is_truncatable
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->is_truncatable (
-          is_truncatable,
-          ACE_TRY_ENV
+          is_truncatable
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7759,16 +7581,13 @@ void POA_CORBA_ValueDef::_set_is_truncatable_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7796,20 +7615,20 @@ void POA_CORBA_ValueDef::is_a_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      id.in (),
-      ACE_TRY_ENV
+      id.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->is_a (
-          id.in (),
-          ACE_TRY_ENV
+          id.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7817,20 +7636,20 @@ void POA_CORBA_ValueDef::is_a_skel (
       CORBA::Boolean _tao_retval_info = _tao_retval;
       ri.result (_tao_retval_info);
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7852,16 +7671,13 @@ void POA_CORBA_ValueDef::is_a_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::describe_value_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl =
@@ -7881,19 +7697,19 @@ void POA_CORBA_ValueDef::describe_value_skel (
   TAO_ServerRequestInfo_CORBA_ValueDef_describe_value ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->describe_value (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -7902,20 +7718,20 @@ void POA_CORBA_ValueDef::describe_value_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -7937,16 +7753,13 @@ void POA_CORBA_ValueDef::describe_value_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::create_value_member_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -7986,13 +7799,13 @@ void POA_CORBA_ValueDef::create_value_member_skel (
       name.in (),
       version.in (),
       type.in (),
-      access,
-      ACE_TRY_ENV
+      access
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8002,8 +7815,8 @@ void POA_CORBA_ValueDef::create_value_member_skel (
           name.in (),
           version.in (),
           type.in (),
-          access,
-          ACE_TRY_ENV
+          access
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8012,20 +7825,20 @@ void POA_CORBA_ValueDef::create_value_member_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8047,16 +7860,13 @@ void POA_CORBA_ValueDef::create_value_member_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::create_attribute_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8096,13 +7906,13 @@ void POA_CORBA_ValueDef::create_attribute_skel (
       name.in (),
       version.in (),
       type.in (),
-      mode,
-      ACE_TRY_ENV
+      mode
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8112,8 +7922,8 @@ void POA_CORBA_ValueDef::create_attribute_skel (
           name.in (),
           version.in (),
           type.in (),
-          mode,
-          ACE_TRY_ENV
+          mode
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8122,20 +7932,20 @@ void POA_CORBA_ValueDef::create_attribute_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8157,16 +7967,13 @@ void POA_CORBA_ValueDef::create_attribute_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::create_operation_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8215,13 +8022,13 @@ void POA_CORBA_ValueDef::create_operation_skel (
       mode,
       params,
       exceptions,
-      contexts,
-      ACE_TRY_ENV
+      contexts
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8234,8 +8041,8 @@ void POA_CORBA_ValueDef::create_operation_skel (
           mode,
           params,
           exceptions,
-          contexts,
-          ACE_TRY_ENV
+          contexts
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -8244,20 +8051,20 @@ void POA_CORBA_ValueDef::create_operation_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -8279,16 +8086,13 @@ void POA_CORBA_ValueDef::create_operation_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -8298,7 +8102,7 @@ void POA_CORBA_ValueDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8310,12 +8114,12 @@ void POA_CORBA_ValueDef::_is_a_skel (
 void POA_CORBA_ValueDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -8327,8 +8131,8 @@ void POA_CORBA_ValueDef::_non_existent_skel (
 void POA_CORBA_ValueDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueDef *_tao_impl = (POA_CORBA_ValueDef *) _tao_object_reference;
@@ -8347,7 +8151,7 @@ void POA_CORBA_ValueDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -8373,11 +8177,11 @@ void POA_CORBA_ValueDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ValueDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -8411,12 +8215,12 @@ void* POA_CORBA_ValueDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ValueDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -8426,9 +8230,9 @@ const char* POA_CORBA_ValueDef::_interface_repository_id (void) const
 }
 
 CORBA_ValueDef*
-POA_CORBA_ValueDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ValueDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
@@ -8596,36 +8400,32 @@ public:
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl
-    ,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result (CORBA_IDLType_ptr result);
@@ -8642,45 +8442,45 @@ private:
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get (
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
-    POA_CORBA_ValueBoxDef *tao_impl,
-    CORBA::Environment &
+    POA_CORBA_ValueBoxDef *tao_impl
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl)
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return parameter_list;
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 0;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::Any_var safe_result_any = result_any;
@@ -8692,7 +8492,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8701,11 +8501,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 void
@@ -8722,36 +8522,32 @@ public:
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *tao_servant_upcall,POA_CORBA_ValueBoxDef *tao_impl
     ,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV =
-      TAO_default_environment ()
-  );
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual Dynamic::ParameterList * arguments (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual Dynamic::ExceptionList * exceptions (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Any * result (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual char * target_most_derived_interface (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean target_is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -8769,8 +8565,8 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest
     TAO_ServerRequest &_tao_server_request,
     TAO_Object_Adapter::Servant_Upcall *_tao_servant_upcall,
     POA_CORBA_ValueBoxDef *tao_impl,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL_NOT_USED
   )
   : TAO_ServerRequestInfo (_tao_server_request, _tao_servant_upcall),
     _tao_impl (tao_impl),
@@ -8778,12 +8574,12 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::TAO_ServerRequest
 {}
 
 Dynamic::ParameterList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the argument list on demand.
   Dynamic::ParameterList *parameter_list =
-    TAO_RequestInfo_Util::make_parameter_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_parameter_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   Dynamic::ParameterList_var safe_parameter_list = parameter_list;
@@ -8799,25 +8595,25 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::arguments (CORBA:
 }
 
 Dynamic::ExceptionList *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::exceptions (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the exception list on demand.
   Dynamic::ExceptionList *exception_list =
-    TAO_RequestInfo_Util::make_exception_list (ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_exception_list (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return exception_list;
 }
 
 CORBA::Any *
-TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::Environment &ACE_TRY_ENV)
+TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Generate the result on demand.
   CORBA::Boolean tk_void_any = 1;
   CORBA::Any *result_any =
-    TAO_RequestInfo_Util::make_any (tk_void_any, ACE_TRY_ENV);
+    TAO_RequestInfo_Util::make_any (tk_void_any TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return result_any;
@@ -8825,7 +8621,7 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::result (CORBA::En
 
 char *
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_derived_interface (
-    CORBA::Environment &)
+    TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return
@@ -8834,11 +8630,11 @@ TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_most_deriv
 
 CORBA::Boolean
 TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_set::target_is_a (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV)
+    const char * id
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->_tao_impl->_is_a (id, ACE_TRY_ENV);
+  return this->_tao_impl->_is_a (id TAO_ENV_ARG_PARAMETER);
 }
 
 #endif /* TAO_HAS_INTERCEPTORS */
@@ -8870,18 +8666,18 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::~_TAO_CORBA_ValueBoxDef_Strateg
 
 _TAO_CORBA_ValueBoxDef_Proxy_Impl&
 _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
-    ::CORBA_ValueBoxDef *object,
-    CORBA::Environment &ACE_TRY_ENV
+    ::CORBA_ValueBoxDef *object
+    TAO_ENV_ARG_DECL
   )
 {
   int strategy =
-    TAO_ORB_Core::collocation_strategy (object, ACE_TRY_ENV);
+    TAO_ORB_Core::collocation_strategy (object TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   if (this->proxy_cache_[strategy] != 0)
     return *this->proxy_cache_[strategy];
 
-  this->create_proxy (strategy, ACE_TRY_ENV);
+  this->create_proxy (strategy TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (*this->proxy_cache_[strategy]);
 
   return *this->proxy_cache_[strategy];
@@ -8890,8 +8686,8 @@ _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::select_proxy (
 
 void
 _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker::create_proxy (
-    int strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int strategy
+    TAO_ENV_ARG_DECL
   )
 {
   ACE_GUARD (TAO_SYNCH_MUTEX, guard, this->mutex_);
@@ -8960,8 +8756,8 @@ _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_
 // ThruPOA Implementation of the IDL interface methods
 
 CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
-    CORBA_Object *_collocated_tao_target_,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_Object *_collocated_tao_target_
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -8976,8 +8772,8 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK_RETURN (0);
     return ACE_reinterpret_cast (
@@ -8986,14 +8782,14 @@ CORBA_IDLType_ptr _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
-        ACE_TRY_ENV
+        TAO_ENV_SINGLE_ARG_PARAMETER
       );
 }
 
 void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
     CORBA_Object *_collocated_tao_target_,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -9006,8 +8802,8 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
   servant_upcall.prepare_for_upcall (
       _collocated_tao_target_->_object_key (),
       "original_type_def",
-      forward_to.out (),
-      ACE_TRY_ENV
+      forward_to.out ()
+      TAO_ENV_ARG_PARAMETER
     );
       ACE_CHECK;
     ACE_reinterpret_cast (
@@ -9016,8 +8812,8 @@ void _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl::original_type_def (
           "IDL:omg.org/CORBA/ValueBoxDef:1.0"
         )
     )->original_type_def (
-        original_type_def,
-        ACE_TRY_ENV
+        original_type_def
+        TAO_ENV_ARG_PARAMETER
       );
   return;
 }
@@ -9049,8 +8845,8 @@ POA_CORBA_ValueBoxDef::~POA_CORBA_ValueBoxDef (void)
 void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueBoxDef *_tao_impl =
@@ -9070,19 +8866,19 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
   TAO_ServerRequestInfo_CORBA_ValueBoxDef_original_type_def_get ri (
       _tao_server_request,
       _tao_upcall,
-      _tao_impl,
-      ACE_TRY_ENV
+      _tao_impl
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
       _tao_retval =
       _tao_impl->original_type_def (
-          ACE_TRY_ENV
+          TAO_ENV_SINGLE_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
@@ -9091,20 +8887,20 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
       ri.result (_tao_retval_info);
       _tao_retval = _tao_retval_info;
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9126,16 +8922,13 @@ void POA_CORBA_ValueBoxDef::_get_original_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
     TAO_ServerRequest &_tao_server_request,
     void *_tao_object_reference,
-    void *_tao_servant_upcall,
-    CORBA::Environment &ACE_TRY_ENV
+    void *_tao_servant_upcall
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9163,39 +8956,39 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
       _tao_server_request,
       _tao_upcall,
       _tao_impl,
-      original_type_def.in (),
-      ACE_TRY_ENV
+      original_type_def.in ()
+      TAO_ENV_ARG_PARAMETER
     );
 
   ACE_TRY
     {
-      _tao_vfr.receive_request (&ri, ACE_TRY_ENV);
+      _tao_vfr.receive_request (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
 #endif /* TAO_HAS_INTERCEPTORS */
 
       _tao_impl->original_type_def (
-          original_type_def.in (),
-          ACE_TRY_ENV
+          original_type_def.in ()
+          TAO_ENV_ARG_PARAMETER
         );
       TAO_INTERCEPTOR_CHECK;
 
 #if (TAO_HAS_INTERCEPTORS == 1)
       ri.reply_status (PortableInterceptor::SUCCESSFUL);
-      _tao_vfr.send_reply (&ri, ACE_TRY_ENV);
+      _tao_vfr.send_reply (&ri TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
     {
       ri.exception (&ACE_ANY_EXCEPTION);
       _tao_vfr.send_exception (
-          &ri,
-          ACE_TRY_ENV
+          &ri
+          TAO_ENV_ARG_PARAMETER
         );
       ACE_TRY_CHECK;
 
       PortableInterceptor::ReplyStatus _tao_status =
-        ri.reply_status (ACE_TRY_ENV);
+        ri.reply_status (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (_tao_status == PortableInterceptor::SYSTEM_EXCEPTION
@@ -9210,16 +9003,13 @@ void POA_CORBA_ValueBoxDef::_set_original_type_def_skel (
 
   // In case _tao_servant_upcall is not used in this function
   ACE_UNUSED_ARG (_tao_servant_upcall);
-
-  // In case ACE_TRY_ENV is not used in this function
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
 }
 
 void POA_CORBA_ValueBoxDef::_is_a_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   TAO_InputCDR &_tao_in = _tao_server_request.incoming ();
@@ -9229,7 +9019,7 @@ void POA_CORBA_ValueBoxDef::_is_a_skel (
   if (!(_tao_in >> value.out ()))
     ACE_THROW (CORBA::MARSHAL ());
 
-  _tao_retval = _tao_impl->_is_a (value.in (), ACE_TRY_ENV);
+  _tao_retval = _tao_impl->_is_a (value.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9241,12 +9031,12 @@ void POA_CORBA_ValueBoxDef::_is_a_skel (
 void POA_CORBA_ValueBoxDef::_non_existent_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference;
-  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (ACE_TRY_ENV);
+  CORBA::Boolean _tao_retval = _tao_impl->_non_existent (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   _tao_server_request.init_reply ();
@@ -9258,8 +9048,8 @@ void POA_CORBA_ValueBoxDef::_non_existent_skel (
 void POA_CORBA_ValueBoxDef::_interface_skel (
     TAO_ServerRequest &_tao_server_request,
     void * _tao_object_reference,
-    void * /* Servant_Upcall */,
-    CORBA::Environment &ACE_TRY_ENV
+    void * /* Servant_Upcall */
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_ValueBoxDef *_tao_impl = (POA_CORBA_ValueBoxDef *) _tao_object_reference;
@@ -9278,7 +9068,7 @@ void POA_CORBA_ValueBoxDef::_interface_skel (
 
   ACE_TRY
     {
-      _tao_retval = _tao_impl->_get_interface (ACE_TRY_ENV);
+      _tao_retval = _tao_impl->_get_interface (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       _tao_server_request.init_reply ();
@@ -9304,11 +9094,11 @@ void POA_CORBA_ValueBoxDef::_interface_skel (
 }
 
 CORBA::Boolean POA_CORBA_ValueBoxDef::_is_a (
-    const char* value,
-    CORBA::Environment &ACE_TRY_ENV
+    const char* value
+    TAO_ENV_ARG_DECL
   )
 {
-  const char *base_id = CORBA::_tc_Object->id (ACE_TRY_ENV);
+  const char *base_id = CORBA::_tc_Object->id (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   if (
@@ -9342,12 +9132,12 @@ void* POA_CORBA_ValueBoxDef::_downcast (
   return 0;
 }
 
-void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall, CORBA::Environment &ACE_TRY_ENV)
+void POA_CORBA_ValueBoxDef::_dispatch (TAO_ServerRequest &req, void *servant_upcall TAO_ENV_ARG_DECL)
 {
   this->synchronous_upcall_dispatch (req,
                                      servant_upcall,
-                                     this,
-                                     ACE_TRY_ENV);
+                                     this
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 
@@ -9357,9 +9147,9 @@ const char* POA_CORBA_ValueBoxDef::_interface_repository_id (void) const
 }
 
 CORBA_ValueBoxDef*
-POA_CORBA_ValueBoxDef::_this (CORBA_Environment &ACE_TRY_ENV)
+POA_CORBA_ValueBoxDef::_this (TAO_ENV_SINGLE_ARG_DECL)
 {
-  TAO_Stub *stub = this->_create_stub (ACE_TRY_ENV);
+  TAO_Stub *stub = this->_create_stub (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   TAO_Stub_Auto_Ptr safe_stub (stub);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
index 70c12c62795..44ebf1426b3 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.h
@@ -64,10 +64,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -76,141 +75,133 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_FixedDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::UShort digits (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_digits_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void digits (
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_digits_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Short scale (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_scale_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void scale (
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_scale_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_FixedDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_FixedDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_FixedDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_FixedDef_Proxy_Impl &select_proxy (
-    ::CORBA_FixedDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_FixedDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -218,18 +209,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_FixedDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -241,7 +232,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -249,52 +240,52 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_FixedDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_FixedDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::UShort digits (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void digits (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Short scale (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void scale (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -319,10 +310,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -331,236 +321,217 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ValueMemberDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Visibility access (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_access_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void access (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_access_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ValueMemberDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl &select_proxy (
-    ::CORBA_ValueMemberDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ValueMemberDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -568,18 +539,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ValueMemberDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -591,7 +562,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -599,60 +570,60 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ValueMemberDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ValueMemberDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA::TypeCode_ptr type (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_IDLType_ptr type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Visibility access (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void access (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -677,10 +648,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -689,283 +659,266 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ValueDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_supported_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_supported_interfaces_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_InitializerSeq * initializers (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_initializers_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void initializers (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_initializers_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDef_ptr base_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_base_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void base_value (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_base_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDefSeq * abstract_base_values (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_abstract_base_values_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void abstract_base_values (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_abstract_base_values_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_abstract (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_is_abstract_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void is_abstract (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_is_abstract_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_custom (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_is_custom_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void is_custom (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_is_custom_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_truncatable (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_is_truncatable_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void is_truncatable (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_is_truncatable_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA::Boolean is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void is_a_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void describe_value_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_ValueMemberDef_ptr create_value_member (
@@ -973,19 +926,18 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_value_member_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_AttributeDef_ptr create_attribute (
@@ -993,19 +945,18 @@ public:
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_attribute_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -1016,287 +967,255 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void create_operation_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void lookup_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void lookup_name_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_contents_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_module_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_constant_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_struct_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_union_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_enum_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_alias_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_value_box_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_exception_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_native_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_abstract_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void create_local_interface_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ValueDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ValueDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ValueDef_Proxy_Impl &select_proxy (
-    ::CORBA_ValueDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ValueDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1304,18 +1223,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ValueDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1327,7 +1246,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1335,181 +1254,181 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ValueDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
-  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl, 
-  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl, 
+  public virtual ::_TAO_CORBA_Container_ThruPOA_Proxy_Impl,
+  public virtual ::_TAO_CORBA_Contained_ThruPOA_Proxy_Impl,
   public virtual ::_TAO_CORBA_IDLType_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ValueDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void supported_interfaces (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_InitializerSeq * initializers (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void initializers (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueDef_ptr base_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void base_value (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueDefSeq * abstract_base_values (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void abstract_base_values (
       CORBA_Object *_collocated_tao_target_,
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_abstract (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void is_abstract (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_custom (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void is_custom (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_truncatable (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void is_truncatable (
       CORBA_Object *_collocated_tao_target_,
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA::Boolean is_a (
       CORBA_Object *_collocated_tao_target_,
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV
+      const char * id
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_ValueMemberDef_ptr create_value_member (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_AttributeDef_ptr create_attribute (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual CORBA_OperationDef_ptr create_operation (
       CORBA_Object *_collocated_tao_target_,
       const char * id,
@@ -1519,14 +1438,14 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
@@ -1551,10 +1470,9 @@ public:
 
 
   virtual CORBA::Boolean _is_a (
-      const char* logical_type_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      const char* logical_type_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual void* _downcast (
       const char* logical_type_id
@@ -1563,198 +1481,181 @@ public:
   static void _is_a_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _non_existent_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _interface_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void _dispatch (
       TAO_ServerRequest &req,
-      void *_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   ::CORBA_ValueBoxDef *_this (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
 
   virtual const char* _interface_repository_id (void) const;
 
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _get_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   virtual void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     )) = 0;
-  
+
     static void _set_original_type_def_skel (
       TAO_ServerRequest &_tao_req,
       void *_tao_obj,
-      void *_tao_servant_upcall,
-      CORBA::Environment &ACE_TRY_ENV
+      void *_tao_servant_upcall
+      TAO_ENV_ARG_DECL
     );
 
   static void _get_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_id_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _set_version_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_defined_in_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_absolute_name_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_containing_repository_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void describe_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void move_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_type_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void _get_def_kind_skel (
       TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
   static void destroy_skel (
-      TAO_ServerRequest &req, 
+      TAO_ServerRequest &req,
       void *obj,
-      void *context,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    );
+      void *context
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS);
+
 
 
 };
 
 
 ///////////////////////////////////////////////////////////////////////
-//               Strategized Proxy Broker Declaration 
+//               Strategized Proxy Broker Declaration
 //
 
 class  _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker : public virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Broker
 {
-public: 
+public:
   _TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ~_TAO_CORBA_ValueBoxDef_Strategized_Proxy_Broker (void);
-  
+
   virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl &select_proxy (
-    ::CORBA_ValueBoxDef *object,
-    CORBA_Environment &ACE_TRY_ENV
+    ::CORBA_ValueBoxDef *object
+    TAO_ENV_ARG_DECL
   );
 
 private:
@@ -1762,18 +1663,18 @@ private:
   // Helper methods that takes care to create the proxy
   // as soon as their use is necessary.
   void create_proxy (
-    int collocation_strategy,
-    CORBA::Environment &ACE_TRY_ENV
+    int collocation_strategy
+    TAO_ENV_ARG_DECL
   );
-  
+
 private:
-  
+
   // Caches the proxy implementations. The proxy implementation
   // are totally stateless, and those can be shared by all the
   // instances of a given IDL interface type.
   ::_TAO_CORBA_ValueBoxDef_Proxy_Impl
   *proxy_cache_[TAO_Collocation_Strategies::CS_LAST];
-  
+
   TAO_SYNCH_MUTEX mutex_;
   // This funxtion is used to get an handle to the unique instance
   // of the Strategized Proxy Broker that is available for a given
@@ -1785,7 +1686,7 @@ public:
 
 
 //
-//            End Strategized Proxy Broker Declaration 
+//            End Strategized Proxy Broker Declaration
 ///////////////////////////////////////////////////////////////////////
 
 
@@ -1793,35 +1694,35 @@ public:
 //                    ThruPOA  Impl. Declaration
 //
 
-class  _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl : 
+class  _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl :
   public virtual ::_TAO_CORBA_ValueBoxDef_Proxy_Impl,
   public virtual TAO_ThruPOA_Object_Proxy_Impl,
   public virtual ::_TAO_CORBA_TypedefDef_ThruPOA_Proxy_Impl
-  
+
 {
 public:
   _TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl (void);
-  
+
   virtual ~_TAO_CORBA_ValueBoxDef_ThruPOA_Proxy_Impl (void) { }
-  
+
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA_Object *_collocated_tao_target_,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_Object *_collocated_tao_target_
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   virtual void original_type_def (
       CORBA_Object *_collocated_tao_target_,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL
     )
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
-  
+
+
 };
 
 //
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
index 6c7be77d4d9..103672775f1 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS.i
@@ -22,915 +22,915 @@
 ACE_INLINE void POA_CORBA_FixedDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_FixedDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_FixedDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_FixedDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueMemberDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueMemberDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::lookup_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::lookup_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::lookup_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::lookup_name_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::describe_contents_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::describe_contents_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_module_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_module_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_constant_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_constant_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_struct_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_struct_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_union_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_union_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_enum_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_enum_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_alias_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_alias_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_value_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_value_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_value_box_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_value_box_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_exception_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_exception_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_native_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_native_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_abstract_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_abstract_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::create_local_interface_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Container_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Container::create_local_interface_skel (
       req,
       (POA_CORBA_Container_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_set_id_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_set_id_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_set_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_set_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_set_version_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_set_version_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_defined_in_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_defined_in_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_absolute_name_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_absolute_name_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_containing_repository_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::_get_containing_repository_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::describe_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::describe_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::move_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_Contained_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_Contained::move_skel (
       req,
       (POA_CORBA_Contained_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_type_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IDLType_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_IDLType::_get_type_skel (
       req,
       (POA_CORBA_IDLType_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::_get_def_kind_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_IRObject::_get_def_kind_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-      ACE_TRY_ENV
+      context
+      TAO_ENV_ARG_PARAMETER
     );
 }
 ACE_INLINE void POA_CORBA_ValueBoxDef::destroy_skel (
     TAO_ServerRequest &req,
     void *obj,
-    void *context,
-    CORBA::Environment &ACE_TRY_ENV
+    void *context
+    TAO_ENV_ARG_DECL
   )
 {
   POA_CORBA_IRObject_ptr impl = (POA_CORBA_ValueBoxDef_ptr) obj;
   POA_CORBA_IRObject::destroy_skel (
       req,
       (POA_CORBA_IRObject_ptr) impl,
-      context,
-       ACE_TRY_ENV
+      context
+       TAO_ENV_ARG_PARAMETER
     );
 }
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
index 15c28e07b90..9d4328f4b01 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.h
@@ -52,7 +52,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_FixedDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -64,75 +64,67 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::UShort digits (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void digits (
-      CORBA::UShort digits,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::UShort digits
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Short scale (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void scale (
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_FixedDef_tie (const POA_CORBA_FixedDef_tie &);
   void operator= (const POA_CORBA_FixedDef_tie &);
@@ -153,7 +145,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ValueMemberDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -165,169 +157,150 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Visibility access (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void access (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ValueMemberDef_tie (const POA_CORBA_ValueMemberDef_tie &);
   void operator= (const POA_CORBA_ValueMemberDef_tie &);
@@ -348,7 +321,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ValueDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -360,174 +333,155 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_InterfaceDefSeq * supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InitializerSeq * initializers (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void initializers (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr base_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void base_value (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDefSeq * abstract_base_values (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void abstract_base_values (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_abstract (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void is_abstract (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_custom (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void is_custom (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_truncatable (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void is_truncatable (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::Boolean is_a (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef::FullValueDescription * describe_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueMemberDef_ptr create_value_member (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AttributeDef_ptr create_attribute (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_OperationDef_ptr create_operation (
       const char * id,
       const char * name,
@@ -536,141 +490,129 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq & params,
       const CORBA_ExceptionDefSeq & exceptions,
-      const CORBA_ContextIdSeq & contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq & contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained_ptr lookup (
-      const char * search_name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * search_name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * contents (
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ContainedSeq * lookup_name (
       const char * search_name,
       CORBA::Long levels_to_search,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container::DescriptionSeq * describe_contents (
       CORBA::DefinitionKind limit_type,
       CORBA::Boolean exclude_inherited,
-      CORBA::Long max_returned_objs,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Long max_returned_objs
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ModuleDef_ptr create_module (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ConstantDef_ptr create_constant (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr type,
-      const CORBA::Any & value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA::Any & value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_StructDef_ptr create_struct (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_UnionDef_ptr create_union (
       const char * id,
       const char * name,
       const char * version,
       CORBA_IDLType_ptr discriminator_type,
-      const CORBA_UnionMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_EnumDef_ptr create_enum (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_EnumMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_EnumMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AliasDef_ptr create_alias (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_InterfaceDef_ptr create_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueDef_ptr create_value (
       const char * id,
       const char * name,
@@ -681,196 +623,176 @@ public:
       CORBA::Boolean is_truncatable,
       const CORBA_ValueDefSeq & abstract_base_values,
       const CORBA_InterfaceDefSeq & supported_interfaces,
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ValueBoxDef_ptr create_value_box (
       const char * id,
       const char * name,
       const char * version,
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_ExceptionDef_ptr create_exception (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_StructMemberSeq & members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq & members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_NativeDef_ptr create_native (
       const char * id,
       const char * name,
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_AbstractInterfaceDef_ptr create_abstract_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_AbstractInterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_LocalInterfaceDef_ptr create_local_interface (
       const char * id,
       const char * name,
       const char * version,
-      const CORBA_InterfaceDefSeq & base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ValueDef_tie (const POA_CORBA_ValueDef_tie &);
   void operator= (const POA_CORBA_ValueDef_tie &);
@@ -891,7 +813,7 @@ public:
   // ctor with T*, ownership flag and a POA
   ~POA_CORBA_ValueBoxDef_tie (void);
   // dtor
-  
+
   // TIE specific functions
   T *_tied_object (void);
   // return the underlying object
@@ -903,152 +825,135 @@ public:
   // do we own it
   void _is_owner (CORBA::Boolean b);
   // set the ownership
-  
+
   // overridden ServantBase operations
   PortableServer::POA_ptr _default_POA (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    );
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+
   CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * id (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void id (
-      const char * id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void name (
-      const char * name,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * name
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * version (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void version (
-      const char * version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Container_ptr defined_in (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     char * absolute_name (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Repository_ptr containing_repository (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA_Contained::Description * describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void move (
       CORBA_Container_ptr new_container,
       const char * new_name,
-      const char * new_version,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char * new_version
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
     void destroy (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((
       CORBA::SystemException
     ));
-  
+
   private:
   T *ptr_;
   PortableServer::POA_var poa_;
   CORBA::Boolean rel_;
-  
+
   // copy and assignment are not allowed
   POA_CORBA_ValueBoxDef_tie (const POA_CORBA_ValueBoxDef_tie &);
   void operator= (const POA_CORBA_ValueBoxDef_tie &);
diff --git a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
index 9a6cd61cc9e..29831f87b03 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
+++ b/TAO/orbsvcs/IFR_Service/IFR_ExtendedS_T.i
@@ -23,30 +23,30 @@
 
 template <class T> ACE_INLINE
 POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_FixedDef_tie<T>::POA_CORBA_FixedDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -90,135 +90,135 @@ POA_CORBA_FixedDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_FixedDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_FixedDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_FixedDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_FixedDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::UShort POA_CORBA_FixedDef_tie<T>::digits  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->digits (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_FixedDef_tie<T>::digits  (
-    CORBA::UShort digits,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::UShort digits
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->digits (
-digits,
-    ACE_TRY_ENV
+digits
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Short POA_CORBA_FixedDef_tie<T>::scale  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->scale (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_FixedDef_tie<T>::scale  (
-    CORBA::Short scale,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Short scale
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->scale (
-scale,
-    ACE_TRY_ENV
+scale
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_FixedDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_FixedDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_FixedDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueMemberDef_tie<T>::POA_CORBA_ValueMemberDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -262,216 +262,216 @@ POA_CORBA_ValueMemberDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ValueMemberDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ValueMemberDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ValueMemberDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ValueMemberDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ValueMemberDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ValueMemberDef_tie<T>::type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::type_def  (
-    CORBA_IDLType_ptr type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->type_def (
-type_def,
-    ACE_TRY_ENV
+type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Visibility POA_CORBA_ValueMemberDef_tie<T>::access  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->access (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::access  (
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Visibility access
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->access (
-access,
-    ACE_TRY_ENV
+access
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ValueMemberDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueMemberDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ValueMemberDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ValueMemberDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -479,8 +479,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -489,63 +489,63 @@ void POA_CORBA_ValueMemberDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ValueMemberDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueMemberDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueDef_tie<T>::POA_CORBA_ValueDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -589,235 +589,235 @@ POA_CORBA_ValueDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ValueDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ValueDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ValueDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ValueDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_InterfaceDefSeq * POA_CORBA_ValueDef_tie<T>::supported_interfaces  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->supported_interfaces (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::supported_interfaces  (
-    const CORBA_InterfaceDefSeq & supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & supported_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->supported_interfaces (
-supported_interfaces,
-    ACE_TRY_ENV
+supported_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_InitializerSeq * POA_CORBA_ValueDef_tie<T>::initializers  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->initializers (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::initializers  (
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->initializers (
-initializers,
-    ACE_TRY_ENV
+initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::base_value  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->base_value (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::base_value  (
-    CORBA_ValueDef_ptr base_value,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_ValueDef_ptr base_value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->base_value (
-base_value,
-    ACE_TRY_ENV
+base_value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDefSeq * POA_CORBA_ValueDef_tie<T>::abstract_base_values  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->abstract_base_values (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::abstract_base_values  (
-    const CORBA_ValueDefSeq & abstract_base_values,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ValueDefSeq & abstract_base_values
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->abstract_base_values (
-abstract_base_values,
-    ACE_TRY_ENV
+abstract_base_values
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_abstract  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_abstract (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::is_abstract  (
-    CORBA::Boolean is_abstract,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_abstract
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->is_abstract (
-is_abstract,
-    ACE_TRY_ENV
+is_abstract
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_custom  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_custom (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::is_custom  (
-    CORBA::Boolean is_custom,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_custom
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->is_custom (
-is_custom,
-    ACE_TRY_ENV
+is_custom
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_truncatable  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_truncatable (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::is_truncatable  (
-    CORBA::Boolean is_truncatable,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean is_truncatable
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->is_truncatable (
-is_truncatable,
-    ACE_TRY_ENV
+is_truncatable
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::Boolean POA_CORBA_ValueDef_tie<T>::is_a  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->is_a (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ValueDef::FullValueDescription * POA_CORBA_ValueDef_tie<T>::describe_value  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe_value (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -827,8 +827,8 @@ CORBA_ValueMemberDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_member  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::Visibility access,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Visibility access
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -839,8 +839,8 @@ id,
     name,
     version,
     type,
-    access,
-    ACE_TRY_ENV
+    access
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -850,8 +850,8 @@ CORBA_AttributeDef_ptr POA_CORBA_ValueDef_tie<T>::create_attribute  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -862,8 +862,8 @@ id,
     name,
     version,
     type,
-    mode,
-    ACE_TRY_ENV
+    mode
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -876,8 +876,8 @@ CORBA_OperationDef_ptr POA_CORBA_ValueDef_tie<T>::create_operation  (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq & params,
     const CORBA_ExceptionDefSeq & exceptions,
-    const CORBA_ContextIdSeq & contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq & contexts
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -891,31 +891,31 @@ id,
     mode,
     params,
     exceptions,
-    contexts,
-    ACE_TRY_ENV
+    contexts
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained_ptr POA_CORBA_ValueDef_tie<T>::lookup  (
-    const char * search_name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * search_name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->lookup (
-search_name,
-    ACE_TRY_ENV
+search_name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::contents  (
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -923,8 +923,8 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::contents  (
 {
   return this->ptr_->contents (
 limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -933,8 +933,8 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::lookup_name  (
     const char * search_name,
     CORBA::Long levels_to_search,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -944,8 +944,8 @@ CORBA_ContainedSeq * POA_CORBA_ValueDef_tie<T>::lookup_name  (
 search_name,
     levels_to_search,
     limit_type,
-    exclude_inherited,
-    ACE_TRY_ENV
+    exclude_inherited
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -953,8 +953,8 @@ template <class T> ACE_INLINE
 CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie<T>::describe_contents  (
     CORBA::DefinitionKind limit_type,
     CORBA::Boolean exclude_inherited,
-    CORBA::Long max_returned_objs,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Long max_returned_objs
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -963,8 +963,8 @@ CORBA_Container::DescriptionSeq * POA_CORBA_ValueDef_tie<T>::describe_contents
   return this->ptr_->describe_contents (
 limit_type,
     exclude_inherited,
-    max_returned_objs,
-    ACE_TRY_ENV
+    max_returned_objs
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -972,8 +972,8 @@ template <class T> ACE_INLINE
 CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie<T>::create_module  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -982,8 +982,8 @@ CORBA_ModuleDef_ptr POA_CORBA_ValueDef_tie<T>::create_module  (
   return this->ptr_->create_module (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -993,8 +993,8 @@ CORBA_ConstantDef_ptr POA_CORBA_ValueDef_tie<T>::create_constant  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr type,
-    const CORBA::Any & value,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA::Any & value
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1005,8 +1005,8 @@ id,
     name,
     version,
     type,
-    value,
-    ACE_TRY_ENV
+    value
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1015,8 +1015,8 @@ CORBA_StructDef_ptr POA_CORBA_ValueDef_tie<T>::create_struct  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1026,8 +1026,8 @@ CORBA_StructDef_ptr POA_CORBA_ValueDef_tie<T>::create_struct  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1037,8 +1037,8 @@ CORBA_UnionDef_ptr POA_CORBA_ValueDef_tie<T>::create_union  (
     const char * name,
     const char * version,
     CORBA_IDLType_ptr discriminator_type,
-    const CORBA_UnionMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_UnionMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1049,8 +1049,8 @@ id,
     name,
     version,
     discriminator_type,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1059,8 +1059,8 @@ CORBA_EnumDef_ptr POA_CORBA_ValueDef_tie<T>::create_enum  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_EnumMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_EnumMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1070,8 +1070,8 @@ CORBA_EnumDef_ptr POA_CORBA_ValueDef_tie<T>::create_enum  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1080,8 +1080,8 @@ CORBA_AliasDef_ptr POA_CORBA_ValueDef_tie<T>::create_alias  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1091,8 +1091,8 @@ CORBA_AliasDef_ptr POA_CORBA_ValueDef_tie<T>::create_alias  (
 id,
     name,
     version,
-    original_type,
-    ACE_TRY_ENV
+    original_type
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1101,8 +1101,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1112,8 +1112,8 @@ CORBA_InterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1128,8 +1128,8 @@ CORBA_ValueDef_ptr POA_CORBA_ValueDef_tie<T>::create_value  (
     CORBA::Boolean is_truncatable,
     const CORBA_ValueDefSeq & abstract_base_values,
     const CORBA_InterfaceDefSeq & supported_interfaces,
-    const CORBA_InitializerSeq & initializers,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InitializerSeq & initializers
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1145,8 +1145,8 @@ id,
     is_truncatable,
     abstract_base_values,
     supported_interfaces,
-    initializers,
-    ACE_TRY_ENV
+    initializers
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1155,8 +1155,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_box  (
     const char * id,
     const char * name,
     const char * version,
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1166,8 +1166,8 @@ CORBA_ValueBoxDef_ptr POA_CORBA_ValueDef_tie<T>::create_value_box  (
 id,
     name,
     version,
-    original_type_def,
-    ACE_TRY_ENV
+    original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1176,8 +1176,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ValueDef_tie<T>::create_exception  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_StructMemberSeq & members,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_StructMemberSeq & members
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1187,8 +1187,8 @@ CORBA_ExceptionDef_ptr POA_CORBA_ValueDef_tie<T>::create_exception  (
 id,
     name,
     version,
-    members,
-    ACE_TRY_ENV
+    members
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1196,8 +1196,8 @@ template <class T> ACE_INLINE
 CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie<T>::create_native  (
     const char * id,
     const char * name,
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1206,8 +1206,8 @@ CORBA_NativeDef_ptr POA_CORBA_ValueDef_tie<T>::create_native  (
   return this->ptr_->create_native (
 id,
     name,
-    version,
-    ACE_TRY_ENV
+    version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1216,8 +1216,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_abstract_interf
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_AbstractInterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_AbstractInterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1227,8 +1227,8 @@ CORBA_AbstractInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_abstract_interf
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
@@ -1237,8 +1237,8 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_local_interface  (
     const char * id,
     const char * name,
     const char * version,
-    const CORBA_InterfaceDefSeq & base_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq & base_interfaces
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1248,144 +1248,144 @@ CORBA_LocalInterfaceDef_ptr POA_CORBA_ValueDef_tie<T>::create_local_interface  (
 id,
     name,
     version,
-    base_interfaces,
-    ACE_TRY_ENV
+    base_interfaces
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ValueDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ValueDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ValueDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1393,8 +1393,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1403,76 +1403,76 @@ void POA_CORBA_ValueDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ValueDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ValueDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T &t)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T &t, PortableServer::POA_ptr poa)
-	: ptr_ (&t),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (0)
+        : ptr_ (&t),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (0)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T *tp, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_nil ()),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_nil ()),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
 POA_CORBA_ValueBoxDef_tie<T>::POA_CORBA_ValueBoxDef_tie (T *tp, PortableServer::POA_ptr poa, CORBA::Boolean release)
-	: ptr_ (tp),
-	  poa_ (PortableServer::POA::_duplicate (poa)),
-	  rel_ (release)
+        : ptr_ (tp),
+          poa_ (PortableServer::POA::_duplicate (poa)),
+          rel_ (release)
 {}
 
 template <class T> ACE_INLINE
@@ -1516,175 +1516,175 @@ POA_CORBA_ValueBoxDef_tie<T>::_is_owner (CORBA::Boolean b)
 }
 
 template <class T> ACE_INLINE PortableServer::POA_ptr
-POA_CORBA_ValueBoxDef_tie<T>::_default_POA (CORBA::Environment &ACE_TRY_ENV)
+POA_CORBA_ValueBoxDef_tie<T>::_default_POA (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (!CORBA::is_nil (this->poa_.in ()))
     return PortableServer::POA::_duplicate (this->poa_.in ());
 
-  return this->POA_CORBA_ValueBoxDef::_default_POA (ACE_TRY_ENV);
+  return this->POA_CORBA_ValueBoxDef::_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 template <class T> ACE_INLINE
 CORBA_IDLType_ptr POA_CORBA_ValueBoxDef_tie<T>::original_type_def  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->original_type_def (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::original_type_def  (
-    CORBA_IDLType_ptr original_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr original_type_def
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->original_type_def (
-original_type_def,
-    ACE_TRY_ENV
+original_type_def
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::id  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->id (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::id  (
-    const char * id,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * id
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->id (
-id,
-    ACE_TRY_ENV
+id
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::name  (
-    const char * name,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * name
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->name (
-name,
-    ACE_TRY_ENV
+name
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::version  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->version (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::version  (
-    const char * version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->version (
-version,
-    ACE_TRY_ENV
+version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Container_ptr POA_CORBA_ValueBoxDef_tie<T>::defined_in  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->defined_in (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 char * POA_CORBA_ValueBoxDef_tie<T>::absolute_name  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->absolute_name (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Repository_ptr POA_CORBA_ValueBoxDef_tie<T>::containing_repository  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->containing_repository (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA_Contained::Description * POA_CORBA_ValueBoxDef_tie<T>::describe  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->describe (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
@@ -1692,8 +1692,8 @@ template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::move  (
     CORBA_Container_ptr new_container,
     const char * new_name,
-    const char * new_version,
-    CORBA::Environment &ACE_TRY_ENV
+    const char * new_version
+    TAO_ENV_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
@@ -1702,47 +1702,47 @@ void POA_CORBA_ValueBoxDef_tie<T>::move  (
   this->ptr_->move (
 new_container,
     new_name,
-    new_version,
-    ACE_TRY_ENV
+    new_version
+    TAO_ENV_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::TypeCode_ptr POA_CORBA_ValueBoxDef_tie<T>::type  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->type (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 CORBA::DefinitionKind POA_CORBA_ValueBoxDef_tie<T>::def_kind  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   return this->ptr_->def_kind (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
 template <class T> ACE_INLINE
 void POA_CORBA_ValueBoxDef_tie<T>::destroy  (
-    CORBA::Environment &ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_DECL
   )
   ACE_THROW_SPEC ((
     CORBA::SystemException
   ))
 {
   this->ptr_->destroy (
-ACE_TRY_ENV
+    TAO_ENV_SINGLE_ARG_PARAMETER
   );
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
index 6764a787082..51fbfd395fa 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Server.cpp
@@ -12,10 +12,10 @@ main (int argc, char *argv[])
 
   ACE_DEBUG ((LM_DEBUG, "TAO Interface Repository\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      int status = server.init (argc, argv, ACE_TRY_ENV);
+      int status = server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -24,10 +24,10 @@ main (int argc, char *argv[])
         }
       else
         {
-          server.run (ACE_TRY_ENV);
+          server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          status = server.fini (ACE_TRY_ENV);
+          status = server.fini (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (status == -1)
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
index ac25c0f5e77..045cad101bd 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.cpp
@@ -44,25 +44,25 @@ IFR_Service::~IFR_Service (void)
 
 int
 IFR_Service::init (int argc,
-                   char *argv[],
-                   CORBA::Environment &ACE_TRY_ENV)
+                   char *argv[]
+                   TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       this->orb_ = CORBA::ORB_init (argc,
                                     argv,
-                                    0,
-                                    ACE_TRY_ENV);
+                                    0
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("RootPOA",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->root_poa_ =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int retval = OPTIONS::instance()->parse_args (argc,
@@ -71,31 +71,31 @@ IFR_Service::init (int argc,
       if (retval != 0)
         return retval;
 
-      retval = this->create_poas (ACE_TRY_ENV);
+      retval = this->create_poas (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->open_config (ACE_TRY_ENV);
+      retval = this->open_config (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->create_repository (ACE_TRY_ENV);
+      retval = this->create_repository (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->create_locator (ACE_TRY_ENV);
+      retval = this->create_locator (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
         return retval;
 
-      retval = this->init_multicast_server (ACE_TRY_ENV);
+      retval = this->init_multicast_server (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (retval != 0)
@@ -118,22 +118,22 @@ IFR_Service::init (int argc,
 }
 
 int
-IFR_Service::run (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->orb_->run (0, ACE_TRY_ENV);
+  this->orb_->run (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-IFR_Service::fini (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::fini (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
       this->root_poa_->destroy (1,
-                                1,
-                                ACE_TRY_ENV);
+                                1
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -148,13 +148,13 @@ IFR_Service::fini (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::create_poas (TAO_ENV_SINGLE_ARG_DECL)
 {
   PortableServer::POAManager_var poa_manager =
-    this->root_poa_->the_POAManager (ACE_TRY_ENV);
+    this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  poa_manager->activate (ACE_TRY_ENV);
+  poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::PolicyList policies (4);
@@ -162,8 +162,8 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
 
   // So the Repository's POA can survive a crash.
   policies[0] =
-    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                             ACE_TRY_ENV);
+    this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_TString repo_name = "repoPOA";
@@ -171,8 +171,8 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
   this->repo_poa_ =
     this->root_poa_->create_POA (repo_name.c_str (),
                                  poa_manager.in (),
-                                 policies,
-                                 ACE_TRY_ENV);
+                                 policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   policies.length (4);
@@ -180,24 +180,24 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
   // So we can create object ids based on the DefinitionKind.
   policies[1] =
     this->root_poa_->create_id_assignment_policy (
-                         PortableServer::USER_ID,
-                         ACE_TRY_ENV
+                         PortableServer::USER_ID
+                         TAO_ENV_ARG_PARAMETER
                        );
   ACE_CHECK_RETURN (-1);
 
   // We'll use a servant manager.
   policies[2] =
     this->root_poa_->create_request_processing_policy (
-                         PortableServer::USE_SERVANT_MANAGER,
-                         ACE_TRY_ENV
+                         PortableServer::USE_SERVANT_MANAGER
+                         TAO_ENV_ARG_PARAMETER
                        );
   ACE_CHECK_RETURN (-1);
 
   // Specifically, we'll use a servant locator.
   policies[3] =
     this->root_poa_->create_servant_retention_policy (
-                         PortableServer::NON_RETAIN,
-                         ACE_TRY_ENV
+                         PortableServer::NON_RETAIN
+                         TAO_ENV_ARG_PARAMETER
                        );
   ACE_CHECK_RETURN (-1);
 
@@ -206,8 +206,8 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
   this->ir_object_poa_ =
     this->root_poa_->create_POA (name.c_str (),
                                  poa_manager.in (),
-                                 policies,
-                                 ACE_TRY_ENV);
+                                 policies
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   // Destroy the policy objects as they have been passed to
@@ -217,7 +217,7 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
   for (CORBA::ULong i = 0; i < length; ++i)
     {
       CORBA::Policy_ptr policy = policies[i];
-      policy->destroy (ACE_TRY_ENV);
+      policy->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -225,22 +225,22 @@ IFR_Service::create_poas (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-IFR_Service::create_locator (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::create_locator (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_NEW_THROW_EX (this->servant_locator_impl_,
                     IFR_ServantLocator (this->repo_impl_),
                     CORBA::NO_MEMORY ());
   ACE_CHECK_RETURN (-1);
 
-  this->ir_object_poa_->set_servant_manager (this->servant_locator_impl_,
-                                             ACE_TRY_ENV);
+  this->ir_object_poa_->set_servant_manager (this->servant_locator_impl_
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   return 0;
 }
 
 int
-IFR_Service::open_config (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::open_config (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (OPTIONS::instance ()->using_registry ())
     {
@@ -294,7 +294,7 @@ IFR_Service::open_config (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::create_repository (TAO_ENV_SINGLE_ARG_DECL)
 {
   TAO_ComponentRepository_i *impl = 0;
   ACE_NEW_THROW_EX (
@@ -328,11 +328,11 @@ IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
   this->repo_impl_ = impl;
 
   PortableServer::ObjectId_var repo_oid =
-    this->repo_poa_->activate_object (impl_tie,
-                                      ACE_TRY_ENV);
+    this->repo_poa_->activate_object (impl_tie
+                                      TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
-  this->repository_ = impl_tie->_this (ACE_TRY_ENV);
+  this->repository_ = impl_tie->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
 
@@ -340,17 +340,17 @@ IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
 
   // Save and output the IOR string.
   this->ifr_ior_ =
-    this->orb_->object_to_string (this->repository_,
-                                  ACE_TRY_ENV);
+    this->orb_->object_to_string (this->repository_
+                                  TAO_ENV_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
   CORBA::Object_var table_object =
-    this->orb_->resolve_initial_references ("IORTable", ACE_TRY_ENV);
+    this->orb_->resolve_initial_references ("IORTable" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   IORTable::Table_var adapter =
-    IORTable::Table::_narrow (table_object.in (), ACE_TRY_ENV);
+    IORTable::Table::_narrow (table_object.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
   if (CORBA::is_nil (adapter.in ()))
     {
@@ -359,8 +359,8 @@ IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
   else
     {
       adapter->bind ("InterfaceRepository",
-                     this->ifr_ior_.in (),
-                     ACE_TRY_ENV);
+                     this->ifr_ior_.in ()
+                     TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
@@ -379,7 +379,7 @@ IFR_Service::create_repository (CORBA::Environment &ACE_TRY_ENV)
 
 // Install ior multicast handler.
 int
-IFR_Service::init_multicast_server (CORBA::Environment &ACE_TRY_ENV)
+IFR_Service::init_multicast_server (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Get reactor instance from TAO.
   ACE_Reactor *reactor = this->orb_->orb_core ()->reactor ();
diff --git a/TAO/orbsvcs/IFR_Service/IFR_Service.h b/TAO/orbsvcs/IFR_Service/IFR_Service.h
index b2cae2223d4..c73abc1c595 100644
--- a/TAO/orbsvcs/IFR_Service/IFR_Service.h
+++ b/TAO/orbsvcs/IFR_Service/IFR_Service.h
@@ -45,30 +45,30 @@ public:
   // Destructor
 
   int init (int argc,
-            char *argv[],
-            CORBA::Environment &ACE_TRY_ENV);
+            char *argv[]
+            TAO_ENV_ARG_DECL);
   // Initialize the IFR service.
 
-  int run (CORBA::Environment &ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the IFR service.
 
-  int fini (CORBA::Environment &ACE_TRY_ENV);
+  int fini (TAO_ENV_SINGLE_ARG_DECL);
   // Shut down the IFR service.
 
 protected:
-  int create_poas (CORBA::Environment &ACE_TRY_ENV);
+  int create_poas (TAO_ENV_SINGLE_ARG_DECL);
   // Two persistent POAs, one using a servant locator.
 
-  int create_locator (CORBA::Environment &ACE_TRY_ENV);
+  int create_locator (TAO_ENV_SINGLE_ARG_DECL);
   // Create a servant locator and register it with its POA.
 
-  int open_config (CORBA::Environment &ACE_TRY_ENV);
+  int open_config (TAO_ENV_SINGLE_ARG_DECL);
   // Open an ACE_Configuration of the appropriate type.
 
-  int create_repository (CORBA::Environment &ACE_TRY_ENV);
+  int create_repository (TAO_ENV_SINGLE_ARG_DECL);
   // Create and initialize the repository.
 
-  int init_multicast_server (CORBA::Environment &ACE_TRY_ENV);
+  int init_multicast_server (TAO_ENV_SINGLE_ARG_DECL);
   // Enable the Interface Repository to answer multicast requests
   // for its IOR.
 
diff --git a/TAO/orbsvcs/IFR_Service/IRObject_i.h b/TAO/orbsvcs/IFR_Service/IRObject_i.h
index eca29249604..315b1a508e6 100644
--- a/TAO/orbsvcs/IFR_Service/IRObject_i.h
+++ b/TAO/orbsvcs/IFR_Service/IRObject_i.h
@@ -53,23 +53,20 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException)) = 0;
   // Pure virtual- the unlocked version called by destroy() wrapper.
 
diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp
index 0cb3193b5ad..2d66e4f1bf2 100644
--- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.cpp
@@ -25,53 +25,53 @@ TAO_InterfaceDef_i::~TAO_InterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_InterfaceDef_i::def_kind (CORBA::Environment &)
+TAO_InterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Interface;
 }
 
-void 
-TAO_InterfaceDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_InterfaceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_InterfaceDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_InterfaceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   // This will get rid of the repo ids, which Contained_i::destroy()'s
   // call to remove_section (recursive = 1) will not get, and also
   // destroy the attribute's anonymous type, if any.
-  this->destroy_special ("attrs", ACE_TRY_ENV);
+  this->destroy_special ("attrs" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
-  this->destroy_special ("ops", ACE_TRY_ENV);
+  this->destroy_special ("ops" TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA_Contained::Description *
-TAO_InterfaceDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -82,15 +82,15 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_InterfaceDescription ifd;
 
-  ifd.name = this->name_i (ACE_TRY_ENV);
+  ifd.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  ifd.id = this->id_i (ACE_TRY_ENV);
+  ifd.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -101,11 +101,11 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   ifd.defined_in = container_id.c_str ();
 
-  ifd.version = this->version_i (ACE_TRY_ENV);
+  ifd.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
-  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV);
+  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = bases->length ();
@@ -120,9 +120,9 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; ++i)
     {
-      oid = 
-        this->repo_->ir_poa ()->reference_to_id (bases[i],
-                                                 ACE_TRY_ENV);
+      oid =
+        this->repo_->ir_poa ()->reference_to_id (bases[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       base_path =
@@ -136,7 +136,7 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      repo_ids[i] = impl.id_i (ACE_TRY_ENV);
+      repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -147,17 +147,17 @@ TAO_InterfaceDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
   return retval._retn ();
 }
 
-CORBA::TypeCode_ptr 
-TAO_InterfaceDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_InterfaceDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_InterfaceDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_InterfaceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -171,23 +171,23 @@ TAO_InterfaceDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
   this->repo_->config ()->get_string_value (this->section_key_,
                                             "name",
                                             name);
-  
+
   return this->repo_->tc_factory ()->create_interface_tc (id.c_str (),
-                                                          name.c_str (),
-                                                          ACE_TRY_ENV);
+                                                          name.c_str ()
+                                                          TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::base_interfaces (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->base_interfaces_i (ACE_TRY_ENV);
+  return this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::base_interfaces_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -215,41 +215,41 @@ TAO_InterfaceDef_i::base_interfaces_i (CORBA::Environment &ACE_TRY_ENV)
       ACE_TString path;
       path_queue.dequeue_head (path);
 
-      CORBA::Object_var obj = 
+      CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (
                                              def_kind,
-                                             path.c_str (),
-                                             ACE_TRY_ENV
+                                             path.c_str ()
+                                             TAO_ENV_ARG_PARAMETER
                                            );
       ACE_CHECK_RETURN (0);
 
-      retval[i] = CORBA_InterfaceDef::_narrow (obj.in (),
-                                               ACE_TRY_ENV);
+      retval[i] = CORBA_InterfaceDef::_narrow (obj.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_InterfaceDef_i::base_interfaces (const CORBA_InterfaceDefSeq &base_interfaces,
-                                     CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_InterfaceDef_i::base_interfaces (const CORBA_InterfaceDefSeq &base_interfaces
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->base_interfaces_i (base_interfaces,
-                           ACE_TRY_ENV);
+  this->base_interfaces_i (base_interfaces
+                           TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfaces,
-                                       CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfaces
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If we are an abstract interface, all our base interfaces must be
   // abstract as well.
-  CORBA::DefinitionKind def_kind = this->def_kind (ACE_TRY_ENV);
+  CORBA::DefinitionKind def_kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   if (def_kind == CORBA::dk_AbstractInterface)
@@ -258,7 +258,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
 
       for (CORBA::ULong i = 0; i < length; ++i)
         {
-          def_kind = base_interfaces[i]->def_kind (ACE_TRY_ENV);
+          def_kind = base_interfaces[i]->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
 
           if (def_kind != CORBA::dk_AbstractInterface)
@@ -289,9 +289,9 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      oid = 
-        this->repo_->ir_poa ()->reference_to_id (base_interfaces[i],
-                                                 ACE_TRY_ENV);
+      oid =
+        this->repo_->ir_poa ()->reference_to_id (base_interfaces[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       inherited_path =
@@ -305,7 +305,7 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      name = impl.name_i (ACE_TRY_ENV);
+      name = impl.name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       // None of these names can clash with any we may already have.
@@ -320,20 +320,20 @@ TAO_InterfaceDef_i::base_interfaces_i (const CORBA_InterfaceDefSeq &base_interfa
     }
 }
 
-CORBA::Boolean 
-TAO_InterfaceDef_i::is_a (const char *interface_id,
-                          CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_InterfaceDef_i::is_a (const char *interface_id
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (interface_id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (interface_id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_InterfaceDef_i::is_a_i (const char *interface_id,
-                            CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_InterfaceDef_i::is_a_i (const char *interface_id
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/Object:1.0") == 0)
@@ -341,7 +341,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
       return 1;
     }
 
-  CORBA::String_var id = this->id_i (ACE_TRY_ENV);
+  CORBA::String_var id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   // Is it our type?
@@ -349,7 +349,7 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
     return 1;
 
   // Is it one of our ancestors' types?
-  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV);
+  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = bases->length ();
@@ -360,9 +360,9 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      oid = 
-        this->repo_->ir_poa ()->reference_to_id (bases[i],
-                                                 ACE_TRY_ENV);
+      oid =
+        this->repo_->ir_poa ()->reference_to_id (bases[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       base_path =
@@ -376,8 +376,8 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      CORBA::Boolean success = impl.is_a_i (interface_id,
-                                            ACE_TRY_ENV);
+      CORBA::Boolean success = impl.is_a_i (interface_id
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       if (success == 1)
@@ -388,16 +388,16 @@ TAO_InterfaceDef_i::is_a_i (const char *interface_id,
 }
 
 CORBA_InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::describe_interface (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_interface_i (ACE_TRY_ENV);
-}     
+  return this->describe_interface_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+}
 
 CORBA_InterfaceDef::FullInterfaceDescription *
-TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::describe_interface_i (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_InterfaceDef::FullInterfaceDescription *fifd = 0;
@@ -407,10 +407,10 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_InterfaceDef::FullInterfaceDescription_var retval = fifd;
 
-  fifd->name = this->name_i (ACE_TRY_ENV);
+  fifd->name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  fifd->id = this->id_i (ACE_TRY_ENV);
+  fifd->id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -421,7 +421,7 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
 
   fifd->defined_in = container_id.c_str ();
 
-  fifd->version = this->version_i (ACE_TRY_ENV);
+  fifd->version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong i = 0;
@@ -472,7 +472,7 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
       TAO_OperationDef_i op (this->repo_,
                              key);
 
-      fifd->operations[i] = op.make_description (ACE_TRY_ENV);
+      fifd->operations[i] = op.make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -520,11 +520,11 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
       TAO_AttributeDef_i attr (this->repo_,
                                key);
 
-      fifd->attributes[i] = attr.make_description (ACE_TRY_ENV);
+      fifd->attributes[i] = attr.make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
-  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (ACE_TRY_ENV);
+  CORBA_InterfaceDefSeq_var bases = this->base_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA::ULong length = bases->length ();
@@ -539,9 +539,9 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
 
   for (i = 0; i < length; ++i)
     {
-      oid = 
-        this->repo_->ir_poa ()->reference_to_id (bases[i],
-                                                 ACE_TRY_ENV);
+      oid =
+        this->repo_->ir_poa ()->reference_to_id (bases[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       base_path =
@@ -555,26 +555,26 @@ TAO_InterfaceDef_i::describe_interface_i (CORBA::Environment &ACE_TRY_ENV)
       TAO_InterfaceDef_i impl (this->repo_,
                                base_key);
 
-      repo_ids[i] = impl.id_i (ACE_TRY_ENV);
+      repo_ids[i] = impl.id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   fifd->base_interfaces = repo_ids;
 
-  fifd->type = this->type_i (ACE_TRY_ENV);
+  fifd->type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
 }
 
-CORBA_AttributeDef_ptr 
+CORBA_AttributeDef_ptr
 TAO_InterfaceDef_i::create_attribute (
     const char *id,
     const char *name,
     const char *version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -584,33 +584,33 @@ TAO_InterfaceDef_i::create_attribute (
                                    name,
                                    version,
                                    type,
-                                   mode,
-                                   ACE_TRY_ENV);
+                                   mode
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_AttributeDef_ptr 
+CORBA_AttributeDef_ptr
 TAO_InterfaceDef_i::create_attribute_i (
     const char *id,
     const char *name,
     const char *version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean bad_params = this->pre_exist (id, 
-                                               name, 
-                                               ACE_TRY_ENV);
+  CORBA::Boolean bad_params = this->pre_exist (id,
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   if (bad_params)
     return CORBA_AttributeDef::_nil ();
 
-  bad_params = this->check_inherited_attrs (name,
-                                            ACE_TRY_ENV);
+  bad_params = this->check_inherited_attrs (name
+                                            TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
-  
+
   if (bad_params)
     return CORBA_AttributeDef::_nil ();
 
@@ -626,17 +626,17 @@ TAO_InterfaceDef_i::create_attribute_i (
 
   // Common to all IR objects created in CORBA_Container.
   ACE_TString path = this->create_common (attrs_key,
-                                          new_key, 
-                                          id, 
-                                          name, 
+                                          new_key,
+                                          id,
+                                          name,
                                           version,
                                           "attrs\\",
                                           CORBA::dk_Attribute);
 
   // Store the path to the attribute's type definition.
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (type,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (type
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   CORBA::String_var type_path =
@@ -656,8 +656,8 @@ TAO_InterfaceDef_i::create_attribute_i (
                          name,
                          version,
                          type,
-                         mode,
-                         ACE_TRY_ENV);
+                         mode
+                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::AttributeDef::_nil ());
 
 #if 0 // CCM specific.
@@ -679,9 +679,9 @@ TAO_InterfaceDef_i::create_attribute_i (
       // Store the paths to the 'get' exceptions.
       for (i = 0; i < length; ++i)
         {
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (get_exceptions[i],
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (get_exceptions[i]
+                                                     TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
@@ -711,9 +711,9 @@ TAO_InterfaceDef_i::create_attribute_i (
       // Store the paths to the 'put' exceptions.
       for (i = 0; i < length; ++i)
         {
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (put_exceptions[i],
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (put_exceptions[i]
+                                                     TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
@@ -733,19 +733,19 @@ TAO_InterfaceDef_i::create_attribute_i (
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Attribute,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   CORBA_AttributeDef_var retval =
-    CORBA_AttributeDef::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+    CORBA_AttributeDef::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_AttributeDef::_nil ());
 
   return retval._retn ();
 }
 
-CORBA_OperationDef_ptr 
+CORBA_OperationDef_ptr
 TAO_InterfaceDef_i::create_operation (const char *id,
                                       const char *name,
                                       const char *version,
@@ -753,8 +753,8 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                       CORBA::OperationMode mode,
                                       const CORBA_ParDescriptionSeq &params,
                                       const CORBA_ExceptionDefSeq &exceptions,
-                                      const CORBA_ContextIdSeq &contexts,
-                                      CORBA::Environment &ACE_TRY_ENV)
+                                      const CORBA_ContextIdSeq &contexts
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_OperationDef::_nil ());
@@ -766,11 +766,11 @@ TAO_InterfaceDef_i::create_operation (const char *id,
                                    mode,
                                    params,
                                    exceptions,
-                                   contexts,
-                                   ACE_TRY_ENV); 
+                                   contexts
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_OperationDef_ptr 
+CORBA_OperationDef_ptr
 TAO_InterfaceDef_i::create_operation_i (const char *id,
                                         const char *name,
                                         const char *version,
@@ -778,18 +778,18 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
                                         CORBA::OperationMode mode,
                                         const CORBA_ParDescriptionSeq &params,
                                         const CORBA_ExceptionDefSeq &exceptions,
-                                        const CORBA_ContextIdSeq &contexts,
-                                        CORBA::Environment &ACE_TRY_ENV)
+                                        const CORBA_ContextIdSeq &contexts
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::Boolean bad_params = this->pre_exist (id, 
-                                               name, 
-                                               ACE_TRY_ENV);
+  CORBA::Boolean bad_params = this->pre_exist (id,
+                                               name
+                                               TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   if (bad_params)
     return CORBA_OperationDef::_nil ();
-  
+
   ACE_Configuration_Section_Key ops_key;
 
   // Create/open section for attributes.
@@ -802,20 +802,20 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
 
   // Common to all IR objects created in CORBA_Container.
   ACE_TString path = this->create_common (ops_key,
-                                          new_key, 
-                                          id, 
-                                          name, 
+                                          new_key,
+                                          id,
+                                          name,
                                           version,
                                           "ops\\",
                                           CORBA::dk_Operation);
 
   // Get the path to our return type and store it.
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (result,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (result
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
-  CORBA::String_var result_path = 
+  CORBA::String_var result_path =
     PortableServer::ObjectId_to_string (oid.in ());
 
   this->repo_->config ()->set_string_value (new_key,
@@ -858,9 +858,9 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
           this->repo_->config ()->set_string_value (param_key,
                                                     "name",
                                                     params[i].name.in ());
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in (),
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in ()
+                                                     TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
@@ -891,9 +891,9 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
 
       for (i = 0; i < length; ++i)
         {
-          PortableServer::ObjectId_var oid = 
-            this->repo_->ir_poa ()->reference_to_id (exceptions[i],
-                                                     ACE_TRY_ENV);
+          PortableServer::ObjectId_var oid =
+            this->repo_->ir_poa ()->reference_to_id (exceptions[i]
+                                                     TAO_ENV_ARG_PARAMETER);
 
           ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
@@ -933,25 +933,25 @@ TAO_InterfaceDef_i::create_operation_i (const char *id,
   // Create the object reference.
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (CORBA::dk_Operation,
-                                                    path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   CORBA_OperationDef_var retval =
-    CORBA_OperationDef::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+    CORBA_OperationDef::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_OperationDef::_nil ());
 
   return retval._retn ();
 }
 
-void 
+void
 TAO_InterfaceDef_i::interface_contents (
     ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
     ACE_Unbounded_Queue<ACE_TString> &path_queue,
     CORBA::DefinitionKind limit_type,
-    CORBA::Boolean exclude_inherited,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::Boolean exclude_inherited
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -1051,16 +1051,16 @@ TAO_InterfaceDef_i::interface_contents (
           base_iface.interface_contents (kind_queue,
                                          path_queue,
                                          limit_type,
-                                         exclude_inherited,
-                                         ACE_TRY_ENV);
-          ACE_CHECK;          
+                                         exclude_inherited
+                                         TAO_ENV_ARG_PARAMETER);
+          ACE_CHECK;
         }
     }
 }
 
 void
-TAO_InterfaceDef_i::destroy_special (const char *sub_section,
-                                     CORBA::Environment &ACE_TRY_ENV)
+TAO_InterfaceDef_i::destroy_special (const char *sub_section
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key sub_key;
@@ -1087,19 +1087,19 @@ TAO_InterfaceDef_i::destroy_special (const char *sub_section,
           TAO_AttributeDef_i attr (this->repo_,
                                    member_key);
 
-          attr.destroy_i (ACE_TRY_ENV);
+          attr.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
-        { 
+        {
           TAO_OperationDef_i op (this->repo_,
                                  member_key);
 
-          op.destroy_i (ACE_TRY_ENV);
+          op.destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
     }
-                                                    
+
 }
 
 void
@@ -1107,8 +1107,8 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA_IDLType_ptr type,
-                                     CORBA::AttributeMode mode,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::AttributeMode mode
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_CString the_get_name ("_get_");
@@ -1135,8 +1135,8 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
                               CORBA::OP_NORMAL,
                               params,
                               excepts,
-                              contexts,
-                              ACE_TRY_ENV);
+                              contexts
+                              TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (mode == CORBA::ATTR_NORMAL)
@@ -1147,9 +1147,9 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
 
       the_set_name += name;
 
-      CORBA_PrimitiveDef_var rettype = 
-        this->repo_->get_primitive (CORBA::pk_void,
-                                    ACE_TRY_ENV);
+      CORBA_PrimitiveDef_var rettype =
+        this->repo_->get_primitive (CORBA::pk_void
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       params.length (1);
@@ -1167,13 +1167,13 @@ TAO_InterfaceDef_i::create_attr_ops (const char *id,
                                   CORBA::OP_NORMAL,
                                   params,
                                   excepts,
-                                  contexts,
-                                  ACE_TRY_ENV);
+                                  contexts
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
-void 
+void
 TAO_InterfaceDef_i::base_interfaces_recursive (
     ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
     ACE_Unbounded_Queue<ACE_TString> &path_queue
@@ -1230,7 +1230,7 @@ TAO_InterfaceDef_i::base_interfaces_recursive (
     }
 }
 
-void 
+void
 TAO_InterfaceDef_i::inherited_attributes (
     ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue
   )
@@ -1251,7 +1251,7 @@ TAO_InterfaceDef_i::inherited_attributes (
     {
       path_queue.dequeue_head (path_name);
 
-      status = 
+      status =
         this->repo_->config ()->expand_path (this->repo_->root_key (),
                                              path_name,
                                              base_key,
@@ -1281,7 +1281,7 @@ TAO_InterfaceDef_i::inherited_attributes (
     }
 }
 
-void 
+void
 TAO_InterfaceDef_i::inherited_operations (
     ACE_Unbounded_Queue<ACE_Configuration_Section_Key> &key_queue
   )
@@ -1302,7 +1302,7 @@ TAO_InterfaceDef_i::inherited_operations (
     {
       path_queue.dequeue_head (path_name);
 
-      status = 
+      status =
         this->repo_->config ()->expand_path (this->repo_->root_key (),
                                              path_name,
                                              base_key,
@@ -1332,9 +1332,9 @@ TAO_InterfaceDef_i::inherited_operations (
     }
 }
 
-CORBA::Boolean 
-TAO_InterfaceDef_i::check_inherited_attrs (const char *name,
-                                           CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_InterfaceDef_i::check_inherited_attrs (const char *name
+                                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
diff --git a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
index 6cce4cefab1..88a237df5ad 100644
--- a/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/InterfaceDef_i.h
@@ -35,8 +35,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_InterfaceDef_i : public virtual TAO_Container_i, 
-                           public virtual TAO_Contained_i, 
+class TAO_InterfaceDef_i : public virtual TAO_Container_i,
+                           public virtual TAO_Contained_i,
                            public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -51,117 +51,101 @@ public:
   // Constructor
 
   virtual ~TAO_InterfaceDef_i (void);
-  // Destructor  
+  // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_InterfaceDefSeq *base_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDefSeq *base_interfaces_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_interfaces (
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_interfaces_i (
-      const CORBA_InterfaceDefSeq &base_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq &base_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_InterfaceDef::FullInterfaceDescription *describe_interface (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));      
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef::FullInterfaceDescription *describe_interface_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));      
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_AttributeDef_ptr create_attribute (
       const char *id,
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AttributeDef_ptr create_attribute_i (
@@ -169,10 +153,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -183,10 +166,9 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_OperationDef_ptr create_operation_i (
@@ -197,29 +179,26 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void interface_contents (
       ACE_Unbounded_Queue<CORBA::DefinitionKind> &kind_queue,
       ACE_Unbounded_Queue<ACE_TString> &path_queue,
       CORBA::DefinitionKind limit_type,
-      CORBA::Boolean exclude_inherited,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean exclude_inherited
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Gathers the attributes and operations of all the ancestors.
 
 private:
   void destroy_special (
-      const char *sub_section,
-        CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *sub_section
+        TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Removed the repo ids of our attributes and operations from
   // the flat repo ids section of the repository.
@@ -228,8 +207,8 @@ private:
                         const char *name,
                         const char *version,
                         CORBA_IDLType_ptr type,
-                        CORBA::AttributeMode mode,
-                        CORBA::Environment &ACE_TRY_ENV)
+                        CORBA::AttributeMode mode
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Create set and/or get operations for an attribute.
 
@@ -252,8 +231,8 @@ private:
   // Depth-first traversal of the inheritance tree to get all the
   // operations.
 
-  CORBA::Boolean check_inherited_attrs (const char *name,
-                                        CORBA::Environment &ACE_TRY_ENV)
+  CORBA::Boolean check_inherited_attrs (const char *name
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // When creating a new attribute, check for a clash with an inherited
   // attribute name.
diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp
index d51a8959ad4..06c9d510374 100644
--- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.cpp
@@ -23,26 +23,26 @@ TAO_LocalInterfaceDef_i::~TAO_LocalInterfaceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_LocalInterfaceDef_i::def_kind (CORBA::Environment &)
+TAO_LocalInterfaceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_LocalInterface;
 }
 
-CORBA::Boolean 
-TAO_LocalInterfaceDef_i::is_a (const char *interface_id,
-                               CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_LocalInterfaceDef_i::is_a (const char *interface_id
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (interface_id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (interface_id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id,
-                                 CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (interface_id, "IDL:omg.org/CORBA/LocalBase:1.0") == 0)
@@ -50,6 +50,6 @@ TAO_LocalInterfaceDef_i::is_a_i (const char *interface_id,
       return 1;
     }
 
-  return this->TAO_InterfaceDef_i::is_a_i (interface_id,
-                                           ACE_TRY_ENV);
+  return this->TAO_InterfaceDef_i::is_a_i (interface_id
+                                           TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h
index a6a178629eb..9c99c164af3 100644
--- a/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/LocalInterfaceDef_i.h
@@ -47,27 +47,24 @@ public:
   // Constructor
 
   virtual ~TAO_LocalInterfaceDef_i (void);
-  // Destructor  
+  // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::Boolean is_a (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *interface_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *interface_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp
index 9e2963720c9..81063de075e 100644
--- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.cpp
@@ -19,45 +19,45 @@ TAO_ModuleDef_i::~TAO_ModuleDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ModuleDef_i::def_kind (CORBA::Environment &)
+TAO_ModuleDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Module;
 }
 
 void 
-TAO_ModuleDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_ModuleDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_ModuleDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ModuleDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
     
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA_Contained::Description *
-TAO_ModuleDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ModuleDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_ModuleDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -68,15 +68,15 @@ TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_ModuleDescription md;
 
-  md.name = this->name_i (ACE_TRY_ENV);
+  md.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  md.id = this->id_i (ACE_TRY_ENV);
+  md.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -87,7 +87,7 @@ TAO_ModuleDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   md.defined_in = container_id.c_str ();
 
-  md.version = this->version_i (ACE_TRY_ENV);
+  md.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   retval->value <<= md;
diff --git a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h
index ef5e8d224fd..d6f1c902c12 100644
--- a/TAO/orbsvcs/IFR_Service/ModuleDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ModuleDef_i.h
@@ -52,37 +52,32 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp
index 6aa481df36e..458f8b216c1 100644
--- a/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.cpp
@@ -20,23 +20,23 @@ TAO_NativeDef_i::~TAO_NativeDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_NativeDef_i::def_kind (CORBA::Environment &)
+TAO_NativeDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Native;
 }
 
-CORBA::TypeCode_ptr 
-TAO_NativeDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_NativeDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_NativeDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_NativeDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -50,7 +50,7 @@ TAO_NativeDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             name);
 
   return this->repo_->tc_factory ()->create_native_tc (id.c_str (),
-                                                       name.c_str (),
-                                                       ACE_TRY_ENV);
+                                                       name.c_str ()
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
diff --git a/TAO/orbsvcs/IFR_Service/NativeDef_i.h b/TAO/orbsvcs/IFR_Service/NativeDef_i.h
index d369fbba640..b3e758f97ac 100644
--- a/TAO/orbsvcs/IFR_Service/NativeDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/NativeDef_i.h
@@ -51,23 +51,20 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp
index 80c674f66f5..93a972df3bb 100644
--- a/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.cpp
@@ -24,23 +24,23 @@ TAO_OperationDef_i::~TAO_OperationDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_OperationDef_i::def_kind (CORBA::Environment &)
+TAO_OperationDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Operation;
 }
 
 CORBA_Contained::Description *
-TAO_OperationDef_i::describe (CORBA::Environment &ACE_TRY_ENV )
+TAO_OperationDef_i::describe (TAO_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_OperationDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV )
+TAO_OperationDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -51,26 +51,26 @@ TAO_OperationDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV )
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  retval->value <<= this->make_description (ACE_TRY_ENV);
+  retval->value <<= this->make_description (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   return retval._retn ();
 }
 
-CORBA::TypeCode_ptr 
-TAO_OperationDef_i::result (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_OperationDef_i::result (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->result_i (ACE_TRY_ENV);
+  return this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_OperationDef_i::result_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_OperationDef_i::result_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
@@ -85,26 +85,26 @@ TAO_OperationDef_i::result_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (result_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (result_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (ACE_TRY_ENV);
+  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_OperationDef_i::result_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_OperationDef_i::result_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->result_def_i (ACE_TRY_ENV);
+  return this->result_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_OperationDef_i::result_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_OperationDef_i::result_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString result_path;
@@ -128,33 +128,33 @@ TAO_OperationDef_i::result_def_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    result_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    result_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::result_def (CORBA_IDLType_ptr result_def,
-                                CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::result_def (CORBA_IDLType_ptr result_def
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->result_def_i (result_def,
-                      ACE_TRY_ENV);
+  this->result_def_i (result_def
+                      TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def,
-                                  CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (result_def,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (result_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var result_path =
@@ -166,16 +166,16 @@ TAO_OperationDef_i::result_def_i (CORBA_IDLType_ptr result_def,
 }
 
 CORBA_ParDescriptionSeq *
-TAO_OperationDef_i::params (CORBA::Environment &ACE_TRY_ENV)
+TAO_OperationDef_i::params (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->params_i (ACE_TRY_ENV);
+  return this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ParDescriptionSeq *
-TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_OperationDef_i::params_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong i = 0;
@@ -257,13 +257,13 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV)
                                            0);
 
       TAO_IDLType_i *impl =
-        this->repo_->servant_factory ()->create_idltype (type_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (type_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      retval[i].type = impl->type_i (ACE_TRY_ENV);
+      retval[i].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       u_int kind = 0;
@@ -274,34 +274,34 @@ TAO_OperationDef_i::params_i (CORBA::Environment &ACE_TRY_ENV)
       CORBA::DefinitionKind def_kind =
         ACE_static_cast (CORBA::DefinitionKind, kind);
 
-      CORBA::Object_var obj = 
+      CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (def_kind,
-                                                        type_path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        type_path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      retval[i].type_def = CORBA_IDLType::_narrow (obj.in (),
-                                                   ACE_TRY_ENV);
+      retval[i].type_def = CORBA_IDLType::_narrow (obj.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_OperationDef_i::params (const CORBA_ParDescriptionSeq &params,
-                            CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::params (const CORBA_ParDescriptionSeq &params
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->params_i (params,
-                  ACE_TRY_ENV);
+  this->params_i (params
+                  TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params,
-                              CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -336,9 +336,9 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params,
       this->repo_->config ()->set_string_value (param_key,
                                                 "name",
                                                 params[i].name.in ());
-      PortableServer::ObjectId_var oid = 
-        this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+      PortableServer::ObjectId_var oid =
+        this->repo_->ir_poa ()->reference_to_id (params[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var type_path =
@@ -354,17 +354,17 @@ TAO_OperationDef_i::params_i (const CORBA_ParDescriptionSeq &params,
     }
 }
 
-CORBA::OperationMode 
-TAO_OperationDef_i::mode (CORBA::Environment &ACE_TRY_ENV)
+CORBA::OperationMode
+TAO_OperationDef_i::mode (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::OP_NORMAL);
 
-  return this->mode_i (ACE_TRY_ENV);
+  return this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::OperationMode 
-TAO_OperationDef_i::mode_i (CORBA::Environment &)
+CORBA::OperationMode
+TAO_OperationDef_i::mode_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int mode;
@@ -375,20 +375,20 @@ TAO_OperationDef_i::mode_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::OperationMode, mode);
 }
 
-void 
-TAO_OperationDef_i::mode (CORBA::OperationMode mode,
-                          CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::mode (CORBA::OperationMode mode
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->mode_i (mode,
-                ACE_TRY_ENV);
+  this->mode_i (mode
+                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::mode_i (CORBA::OperationMode mode,
-                            CORBA::Environment &)
+void
+TAO_OperationDef_i::mode_i (CORBA::OperationMode mode
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -397,16 +397,16 @@ TAO_OperationDef_i::mode_i (CORBA::OperationMode mode,
 }
 
 CORBA_ContextIdSeq *
-TAO_OperationDef_i::contexts (CORBA::Environment &ACE_TRY_ENV)
+TAO_OperationDef_i::contexts (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->contexts_i (ACE_TRY_ENV);
+  return this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ContextIdSeq *
-TAO_OperationDef_i::contexts_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_OperationDef_i::contexts_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key contexts_key;
@@ -425,7 +425,7 @@ TAO_OperationDef_i::contexts_i (CORBA::Environment &ACE_TRY_ENV)
       CORBA::String_var field_name = this->int_to_string (index);
       ACE_TString context;
 
-      // Don't have to worry about gaps here - contexts are not 
+      // Don't have to worry about gaps here - contexts are not
       // IR objects so they can't be destroyed one at a time. To
       // make a change one has to call the mutator version of this
       // function and make a completely new list.
@@ -460,20 +460,20 @@ TAO_OperationDef_i::contexts_i (CORBA::Environment &ACE_TRY_ENV)
   return ci_seq;
 }
 
-void 
-TAO_OperationDef_i::contexts (const CORBA_ContextIdSeq &contexts,
-                              CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::contexts (const CORBA_ContextIdSeq &contexts
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->contexts_i (contexts,
-                    ACE_TRY_ENV);
+  this->contexts_i (contexts
+                    TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts,
-                                CORBA::Environment &)
+void
+TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts
+                                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -502,16 +502,16 @@ TAO_OperationDef_i::contexts_i (const CORBA_ContextIdSeq &contexts,
 }
 
 CORBA_ExceptionDefSeq *
-TAO_OperationDef_i::exceptions (CORBA::Environment &ACE_TRY_ENV )
+TAO_OperationDef_i::exceptions (TAO_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->exceptions_i (ACE_TRY_ENV);
+  return this->exceptions_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ExceptionDefSeq *
-TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV )
+TAO_OperationDef_i::exceptions_i (TAO_ENV_SINGLE_ARG_DECL )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration_Section_Key excepts_key;
@@ -558,7 +558,7 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV )
                                                          "def_kind",
                                                          kind);
 
-              def_kind = 
+              def_kind =
                 ACE_static_cast (CORBA::DefinitionKind, kind);
 
               kind_queue.enqueue_tail (def_kind);
@@ -591,32 +591,32 @@ TAO_OperationDef_i::exceptions_i (CORBA::Environment &ACE_TRY_ENV )
 
       CORBA::Object_var obj =
         this->repo_->servant_factory ()->create_objref (def_kind,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
-      retval[i] = CORBA_ExceptionDef::_narrow (obj.in (),
-                                               ACE_TRY_ENV);
+      retval[i] = CORBA_ExceptionDef::_narrow (obj.in ()
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_OperationDef_i::exceptions (const CORBA_ExceptionDefSeq &exceptions,
-                                CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::exceptions (const CORBA_ExceptionDefSeq &exceptions
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->exceptions_i (exceptions,
-                      ACE_TRY_ENV);
+  this->exceptions_i (exceptions
+                      TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions,
-                                  CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->remove_section (this->section_key_,
@@ -636,9 +636,9 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions,
 
   for (CORBA::ULong i = 0; i < length; i++)
     {
-      PortableServer::ObjectId_var oid = 
-        this->repo_->ir_poa ()->reference_to_id (exceptions[i],
-                                                 ACE_TRY_ENV);
+      PortableServer::ObjectId_var oid =
+        this->repo_->ir_poa ()->reference_to_id (exceptions[i]
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var type_path =
@@ -655,15 +655,15 @@ TAO_OperationDef_i::exceptions_i (const CORBA_ExceptionDefSeq &exceptions,
 
 CORBA_OperationDescription
 TAO_OperationDef_i::make_description (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_OperationDescription od;
 
-  od.name = this->name_i (ACE_TRY_ENV);
+  od.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  od.id = this->id_i (ACE_TRY_ENV);
+  od.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
   ACE_TString container_id;
@@ -673,21 +673,21 @@ TAO_OperationDef_i::make_description (
 
   od.defined_in = container_id.c_str ();
 
-  od.version = this->version_i (ACE_TRY_ENV);
+  od.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  od.result = this->result_i (ACE_TRY_ENV);
+  od.result = this->result_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  od.mode = this->mode_i (ACE_TRY_ENV);
+  od.mode = this->mode_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
-  CORBA_ContextIdSeq_var cid_seq = this->contexts_i (ACE_TRY_ENV);
+  CORBA_ContextIdSeq_var cid_seq = this->contexts_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
   od.contexts = cid_seq.in ();
 
-  CORBA_ParDescriptionSeq_var pd_seq = this->params_i (ACE_TRY_ENV);
+  CORBA_ParDescriptionSeq_var pd_seq = this->params_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (od);
 
   od.parameters = pd_seq.in ();
@@ -771,7 +771,7 @@ TAO_OperationDef_i::make_description (
           TAO_ExceptionDef_i impl (this->repo_,
                                    type_key);
 
-          od.exceptions[i].type = impl.type_i (ACE_TRY_ENV);
+          od.exceptions[i].type = impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK_RETURN (od);
         }
     }
diff --git a/TAO/orbsvcs/IFR_Service/OperationDef_i.h b/TAO/orbsvcs/IFR_Service/OperationDef_i.h
index 4dacb031d71..165d3a23d39 100644
--- a/TAO/orbsvcs/IFR_Service/OperationDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/OperationDef_i.h
@@ -51,172 +51,146 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr result (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr result_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr result_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr result_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void result_def (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void result_def_i (
-      CORBA_IDLType_ptr result_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr result_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ParDescriptionSeq *params (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ParDescriptionSeq *params_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void params (
-      const CORBA_ParDescriptionSeq &params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ParDescriptionSeq &params
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void params_i (
-      const CORBA_ParDescriptionSeq &params,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ParDescriptionSeq &params
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::OperationMode mode (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::OperationMode mode_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void mode (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void mode_i (
-      CORBA::OperationMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::OperationMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ContextIdSeq *contexts (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ContextIdSeq *contexts_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void contexts (
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void contexts_i (
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ExceptionDefSeq *exceptions (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ExceptionDefSeq *exceptions_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void exceptions (
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void exceptions_i (
-      const CORBA_ExceptionDefSeq &exceptions,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ExceptionDefSeq &exceptions
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_OperationDescription make_description (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Common code for InterfaceDef to call in
   // making its own description.
diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp
index d93a60be76c..f293fdee802 100644
--- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.cpp
@@ -20,76 +20,76 @@ TAO_PrimaryKeyDef_i::~TAO_PrimaryKeyDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PrimaryKeyDef_i::def_kind (CORBA::Environment &)
+TAO_PrimaryKeyDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_PrimaryKey;
 }
 
-void 
-TAO_PrimaryKeyDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_PrimaryKeyDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_PrimaryKeyDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_PrimaryKeyDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_PrimaryKeyDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimaryKeyDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_PrimaryKeyDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_PrimaryKeyDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::Boolean 
-TAO_PrimaryKeyDef_i::is_a (const char *primary_key_id,
-                           CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_PrimaryKeyDef_i::is_a (const char *primary_key_id
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (primary_key_id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (primary_key_id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */,
-                             CORBA::Environment & /* ACE_TRY_ENV */ )
+CORBA::Boolean
+TAO_PrimaryKeyDef_i::is_a_i (const char * /* primary_key_id */
+                             TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_ValueDef_ptr 
-TAO_PrimaryKeyDef_i::primary_key (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ValueDef_ptr
+TAO_PrimaryKeyDef_i::primary_key (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ());
 
-  return this->primary_key_i (ACE_TRY_ENV);
+  return this->primary_key_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_ValueDef_ptr 
-TAO_PrimaryKeyDef_i::primary_key_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA_ValueDef_ptr
+TAO_PrimaryKeyDef_i::primary_key_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h
index ed34c1fe4e5..4c937962cf7 100644
--- a/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/PrimaryKeyDef_i.h
@@ -52,63 +52,54 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::Boolean is_a (
-      const char *primary_key_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *primary_key_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *primary_key_id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *primary_key_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr primary_key (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr primary_key_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
index 448f9c904de..f6343693d55 100644
--- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.cpp
@@ -20,37 +20,37 @@ TAO_PrimitiveDef_i::~TAO_PrimitiveDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PrimitiveDef_i::def_kind (CORBA::Environment &)
+TAO_PrimitiveDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Primitive;
 }
 
 void 
-TAO_PrimitiveDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_PrimitiveDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
 }
 
 CORBA::TypeCode_ptr 
-TAO_PrimitiveDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr 
-TAO_PrimitiveDef_i::type_i (CORBA::Environment &)
+TAO_PrimitiveDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
@@ -110,16 +110,16 @@ TAO_PrimitiveDef_i::type_i (CORBA::Environment &)
 }
 
 CORBA::PrimitiveKind 
-TAO_PrimitiveDef_i::kind (CORBA::Environment &ACE_TRY_ENV)
+TAO_PrimitiveDef_i::kind (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::pk_null);
 
-  return this->kind_i (ACE_TRY_ENV);
+  return this->kind_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::PrimitiveKind 
-TAO_PrimitiveDef_i::kind_i (CORBA::Environment &)
+TAO_PrimitiveDef_i::kind_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int pkind = 0;
diff --git a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h
index 4d847356aec..93bd5663df3 100644
--- a/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/PrimitiveDef_i.h
@@ -50,50 +50,43 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a primitive kind - raises BAD_INV_ORDER.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Must implement this here because it's pure virtual in the
   // base class.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PrimitiveKind kind (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::PrimitiveKind kind_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 #if defined(_MSC_VER) && (_MSC_VER >= 1200)
diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp
index 065b4722ece..67d87d93f3a 100644
--- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.cpp
@@ -20,39 +20,39 @@ TAO_ProvidesDef_i::~TAO_ProvidesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ProvidesDef_i::def_kind (CORBA::Environment &)
+TAO_ProvidesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Provides;
 }
 
 void 
-TAO_ProvidesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_ProvidesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_ProvidesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ProvidesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ProvidesDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ProvidesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ProvidesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ProvidesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -60,16 +60,16 @@ TAO_ProvidesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_ProvidesDef_i::interface_type (CORBA::Environment &ACE_TRY_ENV)
+TAO_ProvidesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
 
-  return this->interface_type_i (ACE_TRY_ENV);
+  return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_ProvidesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ProvidesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h
index 638bd7b82af..519bb360a63 100644
--- a/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ProvidesDef_i.h
@@ -50,49 +50,42 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef_ptr interface_type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp
index e902fb59289..3010f401007 100644
--- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.cpp
@@ -21,39 +21,39 @@ TAO_PublishesDef_i::~TAO_PublishesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_PublishesDef_i::def_kind (CORBA::Environment &)
+TAO_PublishesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Publishes;
 }
 
 void 
-TAO_PublishesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_PublishesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_PublishesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_PublishesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_PublishesDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_PublishesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_PublishesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_PublishesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h
index 6272ca66317..6e68f4b1f91 100644
--- a/TAO/orbsvcs/IFR_Service/PublishesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/PublishesDef_i.h
@@ -51,36 +51,31 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.cpp b/TAO/orbsvcs/IFR_Service/Repository_i.cpp
index 74473273697..f0bddca277e 100644
--- a/TAO/orbsvcs/IFR_Service/Repository_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/Repository_i.cpp
@@ -47,15 +47,15 @@ TAO_Repository_i::TAO_Repository_i (CORBA::ORB_ptr orb,
 
       // Resolve and narrow the TypeCodeFactory.
       CORBA::Object_var object =
-        this->orb_->resolve_initial_references ("TypeCodeFactory",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("TypeCodeFactory"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (object.in ()))
         {
           this->tc_factory_ =
-            CORBA::TypeCodeFactory::_narrow (object.in (),
-                                             ACE_TRY_ENV);
+            CORBA::TypeCodeFactory::_narrow (object.in ()
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (CORBA::is_nil (this->tc_factory_.in ()))
@@ -215,33 +215,33 @@ TAO_Repository_i::~TAO_Repository_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_Repository_i::def_kind (CORBA::Environment &)
+TAO_Repository_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Repository;
 }
 
 void
-TAO_Repository_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW (CORBA::BAD_INV_ORDER (2, CORBA::COMPLETED_NO));
 }
 
 CORBA_Contained_ptr
-TAO_Repository_i::lookup_id (const char *search_id,
-                             CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::lookup_id (const char *search_id
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_Contained::_nil ());
 
-  return this->lookup_id_i (search_id,
-                            ACE_TRY_ENV);
+  return this->lookup_id_i (search_id
+                            TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_Contained_ptr
-TAO_Repository_i::lookup_id_i (const char *search_id,
-                               CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::lookup_id_i (const char *search_id
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (search_id, "IDL:omg.org/CORBA/Object:1.0") == 0
@@ -269,36 +269,36 @@ TAO_Repository_i::lookup_id_i (const char *search_id,
                                     "def_kind",
                                     kind);
 
-  CORBA::DefinitionKind def_kind = 
+  CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (def_kind,
-                                           path.c_str (),
-                                           ACE_TRY_ENV);
+                                           path.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_Contained::_nil ());
 
-  return CORBA_Contained::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_Contained::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc,
-                                          CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::get_canonical_typecode (CORBA::TypeCode_ptr tc
+                                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->get_canonical_typecode_i (tc,
-                                         ACE_TRY_ENV);
+  return this->get_canonical_typecode_i (tc
+                                         TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA::TypeCode_ptr
-TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc,
-                                            CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc
+                                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   switch (kind)
@@ -310,37 +310,37 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc,
       ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA::TypeCode::_nil ());
     case CORBA::tk_array:
     {
-      CORBA::ULong length = tc->length (ACE_TRY_ENV);
+      CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-      CORBA::TypeCode_var ctype = tc->content_type (ACE_TRY_ENV);
+      CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       CORBA::TypeCode_var canon_ctype =
-        this->get_canonical_typecode_i (ctype.in (),
-                                        ACE_TRY_ENV);
+        this->get_canonical_typecode_i (ctype.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       return this->tc_factory ()->create_array_tc (length,
-                                                   canon_ctype.in (),
-                                                   ACE_TRY_ENV);
+                                                   canon_ctype.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
     }
     case CORBA::tk_sequence:
     {
-      CORBA::ULong length = tc->length (ACE_TRY_ENV);
+      CORBA::ULong length = tc->length (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-      CORBA::TypeCode_var ctype = tc->content_type (ACE_TRY_ENV);
+      CORBA::TypeCode_var ctype = tc->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       CORBA::TypeCode_var canon_ctype =
-        this->get_canonical_typecode_i (ctype.in (),
-                                        ACE_TRY_ENV);
+        this->get_canonical_typecode_i (ctype.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       return this->tc_factory ()->create_sequence_tc (length,
-                                                      canon_ctype.in (),
-                                                      ACE_TRY_ENV);
+                                                      canon_ctype.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
     }
     case CORBA::tk_alias:
     case CORBA::tk_objref:
@@ -355,7 +355,7 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc,
     case CORBA::tk_component:
     case CORBA::tk_home:
     {
-      CORBA::String_var id = tc->id (ACE_TRY_ENV);
+      CORBA::String_var id = tc->id (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
       ACE_TString path;
@@ -381,26 +381,26 @@ TAO_Repository_i::get_canonical_typecode_i (CORBA::TypeCode_ptr tc,
           TAO_ExceptionDef_i impl (this,
                                    key);
 
-          return impl.type_i (ACE_TRY_ENV);
+          return impl.type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
         }
       else
         {
           TAO_IDLType_i *impl =
-            this->servant_factory ()->create_idltype (key,
-                                                      ACE_TRY_ENV);
+            this->servant_factory ()->create_idltype (key
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
           auto_ptr<TAO_IDLType_i> safety (impl);
 
-          return impl->type_i (ACE_TRY_ENV);
+          return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
         }
     }
   }
 }
 
 CORBA_PrimitiveDef_ptr
-TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString obj_id ("pkinds\\");
@@ -409,28 +409,28 @@ TAO_Repository_i::get_primitive (CORBA::PrimitiveKind kind,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Primitive,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_PrimitiveDef::_nil ());
 
-  return CORBA_PrimitiveDef::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+  return CORBA_PrimitiveDef::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StringDef_ptr
-TAO_Repository_i::create_string (CORBA::ULong bound,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::create_string (CORBA::ULong bound
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_StringDef::_nil ());
 
-  return this->create_string_i (bound,
-                                ACE_TRY_ENV);
+  return this->create_string_i (bound
+                                TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StringDef_ptr
-TAO_Repository_i::create_string_i (CORBA::ULong bound,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::create_string_i (CORBA::ULong bound
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -468,28 +468,28 @@ TAO_Repository_i::create_string_i (CORBA::ULong bound,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_String,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_StringDef::_nil ());
 
-  return CORBA_StringDef::_narrow (obj.in (),
-                                   ACE_TRY_ENV);
+  return CORBA_StringDef::_narrow (obj.in ()
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_WstringDef_ptr
-TAO_Repository_i::create_wstring (CORBA::ULong bound,
-                                  CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::create_wstring (CORBA::ULong bound
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_WstringDef::_nil ());
 
-  return this->create_wstring_i (bound,
-                                 ACE_TRY_ENV);
+  return this->create_wstring_i (bound
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_WstringDef_ptr
-TAO_Repository_i::create_wstring_i (CORBA::ULong bound,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_Repository_i::create_wstring_i (CORBA::ULong bound
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int count = 0;
@@ -527,36 +527,36 @@ TAO_Repository_i::create_wstring_i (CORBA::ULong bound,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Wstring,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_WstringDef::_nil ());
 
-  return CORBA_WstringDef::_narrow (obj.in (),
-                                    ACE_TRY_ENV);
+  return CORBA_WstringDef::_narrow (obj.in ()
+                                    TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_SequenceDef_ptr
 TAO_Repository_i::create_sequence (CORBA::ULong bound,
-                                   CORBA_IDLType_ptr element_type,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   CORBA_IDLType_ptr element_type
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_SequenceDef::_nil ());
 
   return this->create_sequence_i (bound,
-                                  element_type,
-                                  ACE_TRY_ENV);
+                                  element_type
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_SequenceDef_ptr
 TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
-                                     CORBA_IDLType_ptr element_type,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA_IDLType_ptr element_type
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
-    this->ir_poa_->reference_to_id (element_type,
-                                    ACE_TRY_ENV);
+    this->ir_poa_->reference_to_id (element_type
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
 
   CORBA::String_var element_path =
@@ -605,36 +605,36 @@ TAO_Repository_i::create_sequence_i (CORBA::ULong bound,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Sequence,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_SequenceDef::_nil ());
 
-  return CORBA_SequenceDef::_narrow (obj.in (),
-                                     ACE_TRY_ENV);
+  return CORBA_SequenceDef::_narrow (obj.in ()
+                                     TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ArrayDef_ptr
 TAO_Repository_i::create_array (CORBA::ULong length,
-                                CORBA_IDLType_ptr element_type,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA_IDLType_ptr element_type
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ArrayDef::_nil ());
 
   return this->create_array_i (length,
-                               element_type,
-                               ACE_TRY_ENV);
+                               element_type
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_ArrayDef_ptr
 TAO_Repository_i::create_array_i (CORBA::ULong length,
-                                  CORBA_IDLType_ptr element_type,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA_IDLType_ptr element_type
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
-    this->ir_poa_->reference_to_id (element_type,
-                                    ACE_TRY_ENV);
+    this->ir_poa_->reference_to_id (element_type
+                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
 
   CORBA::String_var element_path =
@@ -683,31 +683,31 @@ TAO_Repository_i::create_array_i (CORBA::ULong length,
 
   CORBA::Object_var obj =
     this->servant_factory_->create_objref (CORBA::dk_Array,
-                                           obj_id.c_str (),
-                                           ACE_TRY_ENV);
+                                           obj_id.c_str ()
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_ArrayDef::_nil ());
 
-  return CORBA_ArrayDef::_narrow (obj.in (),
-                                  ACE_TRY_ENV);
+  return CORBA_ArrayDef::_narrow (obj.in ()
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_FixedDef_ptr
 TAO_Repository_i::create_fixed (CORBA::UShort digits,
-                                CORBA::Short scale,
-                                CORBA::Environment &ACE_TRY_ENV)
+                                CORBA::Short scale
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_FixedDef::_nil ());
 
   return this->create_fixed_i (digits,
-                               scale,
-                               ACE_TRY_ENV);
+                               scale
+                               TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_FixedDef_ptr
 TAO_Repository_i::create_fixed_i (CORBA::UShort /* digits */,
-                                  CORBA::Short /* scale */,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  CORBA::Short /* scale */
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_THROW_RETURN (CORBA::NO_IMPLEMENT (), CORBA_FixedDef::_nil ());
diff --git a/TAO/orbsvcs/IFR_Service/Repository_i.h b/TAO/orbsvcs/IFR_Service/Repository_i.h
index 74742ed7e91..57afd79f4fc 100644
--- a/TAO/orbsvcs/IFR_Service/Repository_i.h
+++ b/TAO/orbsvcs/IFR_Service/Repository_i.h
@@ -58,130 +58,113 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Accessor for the readonly attribute.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // May not be called on a repository - raises BAD_INV_ORDER.
 
   virtual CORBA_Contained_ptr lookup_id (
-      const char *search_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const char *search_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_Contained_ptr lookup_id_i (
-      const char *search_id,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      const char *search_id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr get_canonical_typecode (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr get_canonical_typecode_i (
-      CORBA::TypeCode_ptr tc,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::TypeCode_ptr tc
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::PrimitiveDef_ptr get_primitive (
-      CORBA::PrimitiveKind kind,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::PrimitiveKind kind
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC (( CORBA::SystemException));
   // No locking necessary because the database is not
   // accessed.
 
   virtual CORBA_StringDef_ptr create_string (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StringDef_ptr create_string_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_WstringDef_ptr create_wstring (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_WstringDef_ptr create_wstring_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_SequenceDef_ptr create_sequence (
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   CORBA_SequenceDef_ptr create_sequence_i (
       CORBA::ULong bound,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC (( CORBA::SystemException));
 
   virtual CORBA_ArrayDef_ptr create_array (
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ArrayDef_ptr create_array_i (
       CORBA::ULong length,
-      CORBA_IDLType_ptr element_type,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_FixedDef_ptr create_fixed (
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_FixedDef_ptr create_fixed_i (
       CORBA::UShort digits,
-      CORBA::Short scale,
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      CORBA::Short scale
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   PortableServer::POA_ptr ir_poa (void) const;
diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
index 0e6e59951f2..b60466363bc 100644
--- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.cpp
@@ -22,27 +22,27 @@ TAO_SequenceDef_i::~TAO_SequenceDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_SequenceDef_i::def_kind (CORBA::Environment &)
+TAO_SequenceDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Sequence;
 }
 
-void 
-TAO_SequenceDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_SequenceDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Only if it is (w)string, fixed, array or sequence.
-  this->destroy_element_type (ACE_TRY_ENV);
+  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TString name;
@@ -55,44 +55,44 @@ TAO_SequenceDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
                                           0);
 }
 
-CORBA::TypeCode_ptr 
-TAO_SequenceDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_SequenceDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_SequenceDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_SequenceDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::TypeCode_var element_typecode =
-    this->element_type_i (ACE_TRY_ENV);
+    this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  CORBA::ULong bound = this->bound_i (ACE_TRY_ENV);
+  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_sequence_tc (
                                          bound,
-                                         element_typecode.in (),
-                                         ACE_TRY_ENV
+                                         element_typecode.in ()
+                                         TAO_ENV_ARG_PARAMETER
                                        );
 }
 
-CORBA::ULong 
-TAO_SequenceDef_i::bound (CORBA::Environment &ACE_TRY_ENV)
+CORBA::ULong
+TAO_SequenceDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (ACE_TRY_ENV);
+  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::ULong 
-TAO_SequenceDef_i::bound_i (CORBA::Environment &)
+CORBA::ULong
+TAO_SequenceDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int bound = 0;
@@ -103,20 +103,20 @@ TAO_SequenceDef_i::bound_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::ULong, bound);
 }
 
-void 
-TAO_SequenceDef_i::bound (CORBA::ULong bound,
-                          CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::bound (CORBA::ULong bound
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->bound_i (bound,
-                 ACE_TRY_ENV);
+  this->bound_i (bound
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_SequenceDef_i::bound_i (CORBA::ULong bound,
-                            CORBA::Environment &)
+void
+TAO_SequenceDef_i::bound_i (CORBA::ULong bound
+                            TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
@@ -124,17 +124,17 @@ TAO_SequenceDef_i::bound_i (CORBA::ULong bound,
                                              bound);
 }
 
-CORBA::TypeCode_ptr 
-TAO_SequenceDef_i::element_type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_SequenceDef_i::element_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->element_type_i (ACE_TRY_ENV);
+  return this->element_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_SequenceDef_i::element_type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_SequenceDef_i::element_type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -149,26 +149,26 @@ TAO_SequenceDef_i::element_type_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (element_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (element_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (ACE_TRY_ENV);
+  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_SequenceDef_i::element_type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_SequenceDef_i::element_type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->element_type_def_i (ACE_TRY_ENV);
+  return this->element_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_SequenceDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_SequenceDef_i::element_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -187,41 +187,41 @@ TAO_SequenceDef_i::element_type_def_i (CORBA::Environment &ACE_TRY_ENV)
                                              "def_kind",
                                              kind);
 
-  CORBA::DefinitionKind def_kind = 
+  CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    element_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    element_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def,
-                                     CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::element_type_def (CORBA_IDLType_ptr element_type_def
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->element_type_def_i (element_type_def,
-                            ACE_TRY_ENV);
+  this->element_type_def_i (element_type_def
+                            TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def,
-                                       CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->destroy_element_type (ACE_TRY_ENV);
+  this->destroy_element_type (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (element_type_def,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (element_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var element_path =
@@ -232,9 +232,9 @@ TAO_SequenceDef_i::element_type_def_i (CORBA_IDLType_ptr element_type_def,
                                             element_path.in ());
 }
 
-void 
+void
 TAO_SequenceDef_i::destroy_element_type (
-      CORBA::Environment &ACE_TRY_ENV)
+      TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString element_path;
@@ -268,13 +268,13 @@ TAO_SequenceDef_i::destroy_element_type (
     case CORBA::dk_Sequence:
     {
       TAO_IDLType_i *impl =
-        this->repo_->servant_factory ()->create_idltype (element_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (element_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       auto_ptr<TAO_IDLType_i> safety (impl);
 
-      impl->destroy_i (ACE_TRY_ENV);
+      impl->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK;
 
       break;
diff --git a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h
index a798c09113b..061e91adc6e 100644
--- a/TAO/orbsvcs/IFR_Service/SequenceDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/SequenceDef_i.h
@@ -50,108 +50,92 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong bound_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
       ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr element_type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr element_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr element_type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void element_type_def (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void element_type_def_i (
-      CORBA_IDLType_ptr element_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr element_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void destroy_element_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroys an anonymous non-primitive element type.
 };
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
index 6c002c7d972..7b168fb9cb0 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
+++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.cpp
@@ -14,8 +14,8 @@ IFR_Servant_Factory::IFR_Servant_Factory (TAO_Repository_i *repo)
 
 TAO_IDLType_i *
 IFR_Servant_Factory::create_idltype (
-    ACE_Configuration_Section_Key servant_key,
-    CORBA::Environment &ACE_TRY_ENV
+    ACE_Configuration_Section_Key servant_key
+    TAO_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -230,8 +230,8 @@ IFR_Servant_Factory::create_idltype (
 
 TAO_Contained_i *
 IFR_Servant_Factory::create_contained (
-    ACE_Configuration_Section_Key servant_key,
-    CORBA::Environment &ACE_TRY_ENV
+    ACE_Configuration_Section_Key servant_key
+    TAO_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -512,8 +512,8 @@ IFR_Servant_Factory::create_contained (
 
 TAO_Container_i *
 IFR_Servant_Factory::create_container (
-    ACE_Configuration_Section_Key servant_key,
-    CORBA::Environment &ACE_TRY_ENV
+    ACE_Configuration_Section_Key servant_key
+    TAO_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -638,11 +638,11 @@ IFR_Servant_Factory::create_container (
   }
 }
 
-PortableServer::Servant 
+PortableServer::Servant
 IFR_Servant_Factory::create_tie (
     ACE_Configuration_Section_Key servant_key,
-    PortableServer::POA_ptr poa,
-    CORBA::Environment &ACE_TRY_ENV
+    PortableServer::POA_ptr poa
+    TAO_ENV_ARG_DECL
   )
 {
   u_int def_kind = 0;
@@ -1367,10 +1367,10 @@ IFR_Servant_Factory::create_tie (
   }
 }
 
-CORBA::Object_ptr 
+CORBA::Object_ptr
 IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind,
-                                    const char *obj_id,
-                                    CORBA::Environment &ACE_TRY_ENV)
+                                    const char *obj_id
+                                    TAO_ENV_ARG_DECL)
 {
   PortableServer::ObjectId_var oid =
     PortableServer::string_to_ObjectId (obj_id);
@@ -1487,6 +1487,6 @@ IFR_Servant_Factory::create_objref (CORBA::DefinitionKind def_kind,
   repo_id += "1.0";
 
   return this->repo_->ir_poa ()->create_reference_with_id (oid.in (),
-                                                           repo_id.c_str (),
-                                                           ACE_TRY_ENV);
+                                                           repo_id.c_str ()
+                                                           TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Factory.h b/TAO/orbsvcs/IFR_Service/Servant_Factory.h
index 3b3716ed4ef..8c2657f65d3 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Factory.h
+++ b/TAO/orbsvcs/IFR_Service/Servant_Factory.h
@@ -46,29 +46,29 @@ public:
   IFR_Servant_Factory (TAO_Repository_i *repo);
   // constructor
 
-  TAO_IDLType_i *create_idltype (ACE_Configuration_Section_Key key,
-                                 CORBA::Environment &ACE_TRY_ENV);
+  TAO_IDLType_i *create_idltype (ACE_Configuration_Section_Key key
+                                 TAO_ENV_ARG_DECL);
   // For internal use - faster than creating an object reference and
   // sending a request, and can call utility functions not in IDL.
 
-  TAO_Contained_i *create_contained (ACE_Configuration_Section_Key key,
-                                     CORBA::Environment &ACE_TRY_ENV);
+  TAO_Contained_i *create_contained (ACE_Configuration_Section_Key key
+                                     TAO_ENV_ARG_DECL);
   // For internal use - faster than creating an object reference and
   // sending a request, and can call utility functions not in IDL.
 
-  TAO_Container_i *create_container (ACE_Configuration_Section_Key key,
-                                     CORBA::Environment &ACE_TRY_ENV);
+  TAO_Container_i *create_container (ACE_Configuration_Section_Key key
+                                     TAO_ENV_ARG_DECL);
   // For internal use - faster than creating an object reference and
   // sending a request, and can call utility functions not in IDL.
 
   PortableServer::Servant create_tie (ACE_Configuration_Section_Key key,
-                                      PortableServer::POA_ptr poa,
-                                      CORBA::Environment &ACE_TRY_ENV);
+                                      PortableServer::POA_ptr poa
+                                      TAO_ENV_ARG_DECL);
   // Used by the servant locator to create a servant.
 
   CORBA::Object_ptr create_objref (CORBA::DefinitionKind def_kind,
-                                   const char *obj_id,
-                                   CORBA::Environment &ACE_TRY_ENV);
+                                   const char *obj_id
+                                   TAO_ENV_ARG_DECL);
   // Used to create return values.
 private:
   TAO_Repository_i *repo_;
diff --git a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp
index a99049cf31d..effbe438f55 100644
--- a/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp
+++ b/TAO/orbsvcs/IFR_Service/Servant_Locator.cpp
@@ -22,8 +22,6 @@ IFR_ServantLocator::preinvoke (
   ACE_THROW_SPEC ((CORBA::SystemException,
                    PortableServer::ForwardRequest))
 {
-  TAO_ENV_ARG_DEFN;
-
   CORBA::String_var s =
     PortableServer::ObjectId_to_string (oid);
 
@@ -42,8 +40,8 @@ IFR_ServantLocator::preinvoke (
 
   PortableServer::Servant servant =
     this->repo_->servant_factory ()->create_tie (servant_key,
-                                                 poa,
-                                                 ACE_TRY_ENV);
+                                                 poa
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   cookie = servant;
diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp
index 21e7065a316..c84ee3c3fa5 100644
--- a/TAO/orbsvcs/IFR_Service/StringDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/StringDef_i.cpp
@@ -18,23 +18,23 @@ TAO_StringDef_i::~TAO_StringDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_StringDef_i::def_kind (CORBA::Environment &)
+TAO_StringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_String;
 }
 
-void 
-TAO_StringDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_StringDef_i::destroy_i (CORBA::Environment &)
+void
+TAO_StringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -47,39 +47,39 @@ TAO_StringDef_i::destroy_i (CORBA::Environment &)
                                           0);
 }
 
-CORBA::TypeCode_ptr 
-TAO_StringDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_StringDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_StringDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_StringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong bound = this->bound_i (ACE_TRY_ENV);
+  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_string_tc (
-                                         bound,
-                                         ACE_TRY_ENV
+                                         bound
+                                         TAO_ENV_ARG_PARAMETER
                                        );
 }
 
-CORBA::ULong 
-TAO_StringDef_i::bound (CORBA::Environment &ACE_TRY_ENV)
+CORBA::ULong
+TAO_StringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (ACE_TRY_ENV);
+  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::ULong 
-TAO_StringDef_i::bound_i (CORBA::Environment &)
+CORBA::ULong
+TAO_StringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
@@ -90,20 +90,20 @@ TAO_StringDef_i::bound_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::ULong, retval);
 }
 
-void 
-TAO_StringDef_i::bound (CORBA::ULong bound,
-                        CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StringDef_i::bound (CORBA::ULong bound
+                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->bound_i (bound,
-                 ACE_TRY_ENV);
+  this->bound_i (bound
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_StringDef_i::bound_i (CORBA::ULong bound,
-                          CORBA::Environment &)
+void
+TAO_StringDef_i::bound_i (CORBA::ULong bound
+                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/IFR_Service/StringDef_i.h b/TAO/orbsvcs/IFR_Service/StringDef_i.h
index 336408ee467..4ed4bb83f14 100644
--- a/TAO/orbsvcs/IFR_Service/StringDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/StringDef_i.h
@@ -51,63 +51,54 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong bound_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp
index bf11eb3ef47..acb2883004c 100644
--- a/TAO/orbsvcs/IFR_Service/StructDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/StructDef_i.cpp
@@ -23,45 +23,45 @@ TAO_StructDef_i::~TAO_StructDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_StructDef_i::def_kind (CORBA::Environment &)
+TAO_StructDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Struct;
 }
 
-void 
-TAO_StructDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StructDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_StructDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StructDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-    
+
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
-CORBA::TypeCode_ptr 
-TAO_StructDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_StructDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_StructDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_StructDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -74,26 +74,26 @@ TAO_StructDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             "name",
                                             name);
 
-  CORBA_StructMemberSeq_var members = this->members_i (ACE_TRY_ENV);
+  CORBA_StructMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_struct_tc (id.c_str (),
                                                        name.c_str (),
-                                                       members.in (),
-                                                       ACE_TRY_ENV);
+                                                       members.in ()
+                                                       TAO_ENV_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_StructDef_i::members (CORBA::Environment &ACE_TRY_ENV)
+TAO_StructDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (ACE_TRY_ENV);
+  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_StructMemberSeq *
-TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_StructDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<CORBA::DefinitionKind> kind_queue;
@@ -149,7 +149,7 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
                                                      "def_kind",
                                                      kind);
 
-          CORBA::DefinitionKind def_kind = 
+          CORBA::DefinitionKind def_kind =
             ACE_static_cast (CORBA::DefinitionKind, kind);
 
           kind_queue.enqueue_tail (def_kind);
@@ -157,7 +157,7 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
     }
 
   size_t size = kind_queue.size ();
-                    
+
   CORBA_StructMemberSeq *members = 0;
   ACE_NEW_THROW_EX (members,
                     CORBA_StructMemberSeq (size),
@@ -184,14 +184,14 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
 
       path_queue.dequeue_head (path);
 
-      obj = 
+      obj =
         this->repo_->servant_factory ()->create_objref (kind,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-    
-      retval[k].type_def = CORBA_IDLType::_narrow (obj.in (),
-                                                   ACE_TRY_ENV);
+
+      retval[k].type_def = CORBA_IDLType::_narrow (obj.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       this->repo_->config ()->expand_path (this->repo_->root_key (),
@@ -200,37 +200,37 @@ TAO_StructDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
                                            0);
 
       impl =
-        this->repo_->servant_factory ()->create_idltype (member_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (member_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
-    
-      retval[k].type = impl->type_i (ACE_TRY_ENV);
+
+      retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_StructDef_i::members (const CORBA_StructMemberSeq &members,
-                          CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StructDef_i::members (const CORBA_StructMemberSeq &members
+                          TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->members_i (members,
-                   ACE_TRY_ENV);
+  this->members_i (members
+                   TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members,
-                            CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::ULong count = members.length ();
@@ -258,9 +258,9 @@ TAO_StructDef_i::members_i (const CORBA_StructMemberSeq &members,
                                                 "name",
                                                 members[i].name.in ());
 
-      PortableServer::ObjectId_var oid = 
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+      PortableServer::ObjectId_var oid =
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var path =
diff --git a/TAO/orbsvcs/IFR_Service/StructDef_i.h b/TAO/orbsvcs/IFR_Service/StructDef_i.h
index 47622dd3f76..0249cafeadc 100644
--- a/TAO/orbsvcs/IFR_Service/StructDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/StructDef_i.h
@@ -34,7 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_StructDef_i : public virtual TAO_TypedefDef_i, 
+class TAO_StructDef_i : public virtual TAO_TypedefDef_i,
                         public virtual TAO_Container_i
 {
   // = TITLE
@@ -52,63 +52,54 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_StructMemberSeq *members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_StructMemberSeq *members_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA_StructMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_StructMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp
index 523d1c56536..859c5fa8359 100644
--- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.cpp
@@ -21,16 +21,16 @@ TAO_TypedefDef_i::~TAO_TypedefDef_i (void)
 }
 
 CORBA_Contained::Description *
-TAO_TypedefDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_TypedefDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_TypedefDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA_Contained::Description *desc_ptr = 0;
@@ -41,15 +41,15 @@ TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA_Contained::Description_var retval = desc_ptr;
 
-  retval->kind = this->def_kind (ACE_TRY_ENV);
+  retval->kind = this->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   CORBA_TypeDescription td;
 
   ACE_CHECK_RETURN (0);
-  td.name = this->name_i (ACE_TRY_ENV);
+  td.name = this->name_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 
-  td.id = this->id_i (ACE_TRY_ENV);
+  td.id = this->id_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   ACE_TString container_id;
@@ -60,10 +60,10 @@ TAO_TypedefDef_i::describe_i (CORBA::Environment &ACE_TRY_ENV)
 
   td.defined_in = container_id.c_str ();
 
-  td.version = this->version_i (ACE_TRY_ENV);
+  td.version = this->version_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
-  td.type = this->type_i (ACE_TRY_ENV);
+  td.type = this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
 
   retval->value <<= td;
diff --git a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h
index 9d66c140f1d..40e966cded2 100644
--- a/TAO/orbsvcs/IFR_Service/TypedefDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/TypedefDef_i.h
@@ -53,16 +53,14 @@ public:
   // Destructor
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 };
diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp
index c1aa94e2243..4ca5f622103 100644
--- a/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.cpp
@@ -23,45 +23,45 @@ TAO_UnionDef_i::~TAO_UnionDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_UnionDef_i::def_kind (CORBA::Environment &)
+TAO_UnionDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Union;
 }
 
-void 
-TAO_UnionDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_UnionDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_UnionDef_i::destroy_i (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_UnionDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our members.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
-    
+
   // Destroy ourself.
-  TAO_Contained_i::destroy_i (ACE_TRY_ENV);
+  TAO_Contained_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 }
 
-CORBA::TypeCode_ptr 
-TAO_UnionDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_UnionDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_UnionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_UnionDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -74,30 +74,30 @@ TAO_UnionDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                             "name",
                                             name);
 
-  CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  CORBA_UnionMemberSeq_var members = this->members_i (ACE_TRY_ENV);
+  CORBA_UnionMemberSeq_var members = this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_union_tc (id.c_str (),
                                                       name.c_str (),
                                                       tc.in (),
-                                                      members.in (),
-                                                      ACE_TRY_ENV);
+                                                      members.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_UnionDef_i::discriminator_type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_UnionDef_i::discriminator_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->discriminator_type_i (ACE_TRY_ENV);
+  return this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_UnionDef_i::discriminator_type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_UnionDef_i::discriminator_type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
@@ -111,26 +111,26 @@ TAO_UnionDef_i::discriminator_type_i (CORBA::Environment &ACE_TRY_ENV)
                                        disc_key,
                                        0);
 
-  TAO_IDLType_i *impl = 
-    this->repo_->servant_factory ()->create_idltype (disc_key,
-                                                     ACE_TRY_ENV);
+  TAO_IDLType_i *impl =
+    this->repo_->servant_factory ()->create_idltype (disc_key
+                                                     TAO_ENV_ARG_PARAMETER);
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  return impl->type_i (ACE_TRY_ENV);
+  return impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_UnionDef_i::discriminator_type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_UnionDef_i::discriminator_type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->discriminator_type_def_i (ACE_TRY_ENV);
+  return this->discriminator_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_UnionDef_i::discriminator_type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_UnionDef_i::discriminator_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString disc_path;
@@ -154,41 +154,41 @@ TAO_UnionDef_i::discriminator_type_def_i (CORBA::Environment &ACE_TRY_ENV)
 
   CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    disc_path.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    disc_path.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_UnionDef_i::discriminator_type_def (
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->discriminator_type_def_i (discriminator_type_def,
-                                  ACE_TRY_ENV);
+  this->discriminator_type_def_i (discriminator_type_def
+                                  TAO_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_UnionDef_i::discriminator_type_def_i (
-    CORBA_IDLType_ptr discriminator_type_def,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA_IDLType_ptr discriminator_type_def
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::ObjectId_var oid = 
-    this->repo_->ir_poa ()->reference_to_id (discriminator_type_def,
-                                             ACE_TRY_ENV);
+  PortableServer::ObjectId_var oid =
+    this->repo_->ir_poa ()->reference_to_id (discriminator_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var disc_path =
-    PortableServer::ObjectId_to_string (oid.in ());  
+    PortableServer::ObjectId_to_string (oid.in ());
 
   this->repo_->config ()->set_string_value (this->section_key_,
                                             "disc_path",
@@ -196,16 +196,16 @@ TAO_UnionDef_i::discriminator_type_def_i (
 }
 
 CORBA_UnionMemberSeq *
-TAO_UnionDef_i::members (CORBA::Environment &ACE_TRY_ENV)
+TAO_UnionDef_i::members (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->members_i (ACE_TRY_ENV);
+  return this->members_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_UnionMemberSeq *
-TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
+TAO_UnionDef_i::members_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Unbounded_Queue<ACE_Configuration_Section_Key> key_queue;
@@ -251,7 +251,7 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
     }
 
   size_t size = key_queue.size ();
-                    
+
   CORBA_UnionMemberSeq *members = 0;
   ACE_NEW_THROW_EX (members,
                     CORBA_UnionMemberSeq (size),
@@ -280,8 +280,8 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
       retval[k].name = name.c_str ();
 
       this->fetch_label (next_key,
-                         retval[k],
-                         ACE_TRY_ENV);
+                         retval[k]
+                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       this->repo_->config ()->get_string_value (next_key,
@@ -300,48 +300,48 @@ TAO_UnionDef_i::members_i (CORBA::Environment &ACE_TRY_ENV)
       def_kind =
         ACE_static_cast (CORBA::DefinitionKind, kind);
 
-      obj = 
+      obj =
         this->repo_->servant_factory ()->create_objref (def_kind,
-                                                        path.c_str (),
-                                                        ACE_TRY_ENV);
+                                                        path.c_str ()
+                                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
-    
-      retval[k].type_def = CORBA_IDLType::_narrow (obj.in (),
-                                                   ACE_TRY_ENV);
+
+      retval[k].type_def = CORBA_IDLType::_narrow (obj.in ()
+                                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       impl =
-        this->repo_->servant_factory ()->create_idltype (entry_key,
-                                                         ACE_TRY_ENV);
+        this->repo_->servant_factory ()->create_idltype (entry_key
+                                                         TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
 
       auto_ptr<TAO_IDLType_i> safety (impl);
-    
-      retval[k].type = impl->type_i (ACE_TRY_ENV);
+
+      retval[k].type = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
   return retval._retn ();
 }
 
-void 
-TAO_UnionDef_i::members (const CORBA_UnionMemberSeq &members,
-                         CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_UnionDef_i::members (const CORBA_UnionMemberSeq &members
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->members_i (members,
-                   ACE_TRY_ENV);
+  this->members_i (members
+                   TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members,
-                           CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // Destroy our old members, both refs and defns.
-  TAO_Container_i::destroy_i (ACE_TRY_ENV);
+  TAO_Container_i::destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   ACE_TString section_name;
@@ -373,9 +373,9 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members,
                                                 "name",
                                                 members[i].name.in ());
 
-      PortableServer::ObjectId_var oid = 
-        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in (),
-                                                 ACE_TRY_ENV);
+      PortableServer::ObjectId_var oid =
+        this->repo_->ir_poa ()->reference_to_id (members[i].type_def.in ()
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::String_var member_path =
@@ -386,15 +386,15 @@ TAO_UnionDef_i::members_i (const CORBA_UnionMemberSeq &members,
                                                 member_path.in ());
 
       this->store_label (member_key,
-                         members[i].label,
-                         ACE_TRY_ENV);
+                         members[i].label
+                         TAO_ENV_ARG_PARAMETER);
     }
 }
 
 void
 TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
-                             CORBA_UnionMember &member,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             CORBA_UnionMember &member
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_Configuration::VALUETYPE vt;
@@ -414,20 +414,20 @@ TAO_UnionDef_i::fetch_label (const ACE_Configuration_Section_Key member_key,
                                              "label",
                                              value);
 
-  CORBA::TypeCode_var tc = this->discriminator_type_i (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = this->discriminator_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
-  CORBA::TCKind kind = tc->kind (ACE_TRY_ENV);
+  CORBA::TCKind kind = tc->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   switch (kind)
   {
     case CORBA::tk_char:
-      member.label <<= CORBA::Any::from_char (ACE_static_cast (CORBA::Char, 
+      member.label <<= CORBA::Any::from_char (ACE_static_cast (CORBA::Char,
                                                                value));
       break;
     case CORBA::tk_wchar:
-      member.label <<= CORBA::Any::from_wchar (ACE_static_cast (CORBA::WChar, 
+      member.label <<= CORBA::Any::from_wchar (ACE_static_cast (CORBA::WChar,
                                                                 value));
       break;
     case CORBA::tk_boolean:
diff --git a/TAO/orbsvcs/IFR_Service/UnionDef_i.h b/TAO/orbsvcs/IFR_Service/UnionDef_i.h
index 61131bff37a..ea97eaae096 100644
--- a/TAO/orbsvcs/IFR_Service/UnionDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/UnionDef_i.h
@@ -34,7 +34,7 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_UnionDef_i : public virtual TAO_TypedefDef_i, 
+class TAO_UnionDef_i : public virtual TAO_TypedefDef_i,
                        public virtual TAO_Container_i
 {
   // = TITLE
@@ -52,110 +52,94 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry and its contents.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr discriminator_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr discriminator_type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr discriminator_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr discriminator_type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void discriminator_type_def (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void discriminator_type_def_i (
-      CORBA_IDLType_ptr discriminator_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr discriminator_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_UnionMemberSeq *members (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_UnionMemberSeq *members_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void members (
-      const CORBA_UnionMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void members_i (
-      const CORBA_UnionMemberSeq &members,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_UnionMemberSeq &members
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
   void fetch_label (
       const ACE_Configuration_Section_Key member_key,
-      CORBA_UnionMember &member,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_UnionMember &member
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Used by members() to get each member's label value.
 };
diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
index e9f793abaf6..e36bdaa2ee9 100644
--- a/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.cpp
@@ -18,39 +18,39 @@ TAO_UsesDef_i::~TAO_UsesDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_UsesDef_i::def_kind (CORBA::Environment &)
+TAO_UsesDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Uses;
 }
 
 void 
-TAO_UsesDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void 
-TAO_UsesDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_UsesDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -58,16 +58,16 @@ TAO_UsesDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_UsesDef_i::interface_type (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::interface_type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_InterfaceDef::_nil ());
 
-  return this->interface_type_i (ACE_TRY_ENV);
+  return this->interface_type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDef_ptr 
-TAO_UsesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::interface_type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -75,16 +75,16 @@ TAO_UsesDef_i::interface_type_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA::Boolean 
-TAO_UsesDef_i::is_multiple (CORBA::Environment &ACE_TRY_ENV)
+TAO_UsesDef_i::is_multiple (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_multiple_i (ACE_TRY_ENV);
+  return this->is_multiple_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA::Boolean 
-TAO_UsesDef_i::is_multiple_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_UsesDef_i::is_multiple_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/UsesDef_i.h b/TAO/orbsvcs/IFR_Service/UsesDef_i.h
index a71572e0997..fae4dae86f8 100644
--- a/TAO/orbsvcs/IFR_Service/UsesDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/UsesDef_i.h
@@ -50,61 +50,52 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_InterfaceDef_ptr interface_type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDef_ptr interface_type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_multiple (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_multiple_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp
index e7e413bfc53..802bef26eca 100644
--- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.cpp
@@ -24,23 +24,23 @@ TAO_ValueBoxDef_i::~TAO_ValueBoxDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueBoxDef_i::def_kind (CORBA::Environment &)
+TAO_ValueBoxDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueBox;
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueBoxDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ValueBoxDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueBoxDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ValueBoxDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString id;
@@ -65,32 +65,32 @@ TAO_ValueBoxDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
                                        0);
 
   TAO_IDLType_i *impl =
-    this->repo_->servant_factory ()->create_idltype (boxed_key,
-                                                     ACE_TRY_ENV);
+    this->repo_->servant_factory ()->create_idltype (boxed_key
+                                                     TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   auto_ptr<TAO_IDLType_i> safety (impl);
 
-  CORBA::TypeCode_var tc = impl->type_i (ACE_TRY_ENV);
+  CORBA::TypeCode_var tc = impl->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
   return this->repo_->tc_factory ()->create_value_box_tc (id.c_str (),
                                                           name.c_str (),
-                                                          tc.in (),
-                                                          ACE_TRY_ENV);
+                                                          tc.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ValueBoxDef_i::original_type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ValueBoxDef_i::original_type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->original_type_def_i (ACE_TRY_ENV);
+  return this->original_type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ValueBoxDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ValueBoxDef_i::original_type_def_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString boxed_type;
@@ -109,38 +109,38 @@ TAO_ValueBoxDef_i::original_type_def_i (CORBA::Environment &ACE_TRY_ENV)
                                              "def_kind",
                                              kind);
 
-  CORBA::DefinitionKind def_kind = 
+  CORBA::DefinitionKind def_kind =
     ACE_static_cast (CORBA::DefinitionKind, kind);
 
-  CORBA::Object_var obj = 
+  CORBA::Object_var obj =
     this->repo_->servant_factory ()->create_objref (def_kind,
-                                                    boxed_type.c_str (),
-                                                    ACE_TRY_ENV);
+                                                    boxed_type.c_str ()
+                                                    TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA_IDLType::_nil ());
 
-  return CORBA_IDLType::_narrow (obj.in (),
-                                 ACE_TRY_ENV);
+  return CORBA_IDLType::_narrow (obj.in ()
+                                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueBoxDef_i::original_type_def (CORBA_IDLType_ptr original_type_def,
-                                      CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueBoxDef_i::original_type_def (CORBA_IDLType_ptr original_type_def
+                                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->original_type_def_i (original_type_def,
-                             ACE_TRY_ENV);
+  this->original_type_def_i (original_type_def
+                             TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueBoxDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def,
-                                        CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueBoxDef_i::original_type_def_i (CORBA_IDLType_ptr original_type_def
+                                        TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   PortableServer::ObjectId_var oid =
-    this->repo_->ir_poa ()->reference_to_id (original_type_def,
-                                             ACE_TRY_ENV);
+    this->repo_->ir_poa ()->reference_to_id (original_type_def
+                                             TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   CORBA::String_var boxed_type =
diff --git a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h
index ac54ddd5426..f477053a276 100644
--- a/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ValueBoxDef_i.h
@@ -51,50 +51,43 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_IDLType_ptr original_type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr original_type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void original_type_def (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void original_type_def_i (
-      CORBA_IDLType_ptr original_type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr original_type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp
index 383de673459..1c41ea260f4 100644
--- a/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.cpp
@@ -20,56 +20,56 @@ TAO_ValueDef_i::~TAO_ValueDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueDef_i::def_kind (CORBA::Environment &)
+TAO_ValueDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Value;
 }
 
-void 
-TAO_ValueDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ValueDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ValueDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ValueDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::TypeCode_ptr
+TAO_ValueDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
@@ -77,39 +77,39 @@ TAO_ValueDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::supported_interfaces (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->supported_interfaces_i (ACE_TRY_ENV);
+  return this->supported_interfaces_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InterfaceDefSeq *
-TAO_ValueDef_i::supported_interfaces_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::supported_interfaces_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
+void
 TAO_ValueDef_i::supported_interfaces (
-    const CORBA_InterfaceDefSeq &supported_interfaces,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_InterfaceDefSeq &supported_interfaces
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->supported_interfaces_i (supported_interfaces,
-                                ACE_TRY_ENV);
+  this->supported_interfaces_i (supported_interfaces
+                                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ValueDef_i::supported_interfaces_i (
-    const CORBA_InterfaceDefSeq & /* supported_interfaces */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_InterfaceDefSeq & /* supported_interfaces */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -117,239 +117,239 @@ TAO_ValueDef_i::supported_interfaces_i (
 }
 
 CORBA_InitializerSeq *
-TAO_ValueDef_i::initializers (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::initializers (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->initializers_i (ACE_TRY_ENV);
+  return this->initializers_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_InitializerSeq *
-TAO_ValueDef_i::initializers_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::initializers_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::initializers (const CORBA_InitializerSeq &initializers,
-                              CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::initializers (const CORBA_InitializerSeq &initializers
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->initializers_i (initializers,
-                        ACE_TRY_ENV);
+  this->initializers_i (initializers
+                        TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::initializers_i (const CORBA_InitializerSeq & /* initializers */,
-                                CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::initializers_i (const CORBA_InitializerSeq & /* initializers */
+                                TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA_ValueDef_ptr 
-TAO_ValueDef_i::base_value (CORBA::Environment &ACE_TRY_ENV)
+CORBA_ValueDef_ptr
+TAO_ValueDef_i::base_value (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_ValueDef::_nil ());
 
-  return this->base_value_i (ACE_TRY_ENV);
+  return this->base_value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_ValueDef_ptr 
-TAO_ValueDef_i::base_value_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA_ValueDef_ptr
+TAO_ValueDef_i::base_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::base_value (CORBA_ValueDef_ptr base_value,
-                            CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::base_value (CORBA_ValueDef_ptr base_value
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->base_value_i (base_value,
-                      ACE_TRY_ENV);
+  this->base_value_i (base_value
+                      TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::base_value_i (CORBA_ValueDef_ptr /* base_value */,
-                              CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::base_value_i (CORBA_ValueDef_ptr /* base_value */
+                              TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::abstract_base_values (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->abstract_base_values_i (ACE_TRY_ENV);
+  return this->abstract_base_values_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_ValueDefSeq *
-TAO_ValueDef_i::abstract_base_values_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::abstract_base_values_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
+void
 TAO_ValueDef_i::abstract_base_values (
-    const CORBA_ValueDefSeq &abstract_base_values,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ValueDefSeq &abstract_base_values
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
-  
-  this->abstract_base_values_i (abstract_base_values,
-                                ACE_TRY_ENV);
+
+  this->abstract_base_values_i (abstract_base_values
+                                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
+void
 TAO_ValueDef_i::abstract_base_values_i (
-    const CORBA_ValueDefSeq & /* abstract_base_values */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_ValueDefSeq & /* abstract_base_values */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_abstract (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_ValueDef_i::is_abstract (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_abstract_i (ACE_TRY_ENV);
+  return this->is_abstract_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_abstract_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_ValueDef_i::is_abstract_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract,
-                             CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::is_abstract (CORBA::Boolean is_abstract
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->is_abstract (is_abstract,
-                     ACE_TRY_ENV);
+  this->is_abstract (is_abstract
+                     TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::is_abstract_i (CORBA::Boolean /* is_abstract */,
-                             CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::is_abstract_i (CORBA::Boolean /* is_abstract */
+                             TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_custom (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_ValueDef_i::is_custom (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_custom_i (ACE_TRY_ENV);
+  return this->is_custom_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_custom_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_ValueDef_i::is_custom_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom,
-                           CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::is_custom (CORBA::Boolean is_custom
+                           TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->is_custom_i (is_custom,
-                     ACE_TRY_ENV);
+  this->is_custom_i (is_custom
+                     TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::is_custom_i (CORBA::Boolean /* is_custom */,
-                             CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::is_custom_i (CORBA::Boolean /* is_custom */
+                             TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_truncatable (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_ValueDef_i::is_truncatable (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_truncatable_i (ACE_TRY_ENV);
+  return this->is_truncatable_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_truncatable_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_ValueDef_i::is_truncatable_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable,
-                                CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueDef_i::is_truncatable (CORBA::Boolean is_truncatable
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->is_truncatable_i (is_truncatable,
-                          ACE_TRY_ENV);
+  this->is_truncatable_i (is_truncatable
+                          TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */,
-                                  CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueDef_i::is_truncatable_i (CORBA::Boolean /* is_truncatable */
+                                  TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_a (const char *id,
-                      CORBA::Environment &ACE_TRY_ENV)
+CORBA::Boolean
+TAO_ValueDef_i::is_a (const char *id
+                      TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->is_a_i (id,
-                       ACE_TRY_ENV);
+  return this->is_a_i (id
+                       TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA::Boolean 
-TAO_ValueDef_i::is_a_i (const char *id,
-                        CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::Boolean
+TAO_ValueDef_i::is_a_i (const char *id
+                        TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (ACE_OS::strcmp (id, "IDL:omg.org/CORBA/ValueBase:1.0") == 0)
@@ -362,29 +362,29 @@ TAO_ValueDef_i::is_a_i (const char *id,
 }
 
 CORBA_ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueDef_i::describe_value (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_value_i (ACE_TRY_ENV);
-}    
+  return this->describe_value_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+}
 
 CORBA_ValueDef::FullValueDescription *
-TAO_ValueDef_i::describe_value_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueDef_i::describe_value_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
-}     
+}
 
-CORBA_ValueMemberDef_ptr 
+CORBA_ValueMemberDef_ptr
 TAO_ValueDef_i::create_value_member (const char *id,
                                      const char *name,
                                      const char *version,
                                      CORBA_IDLType_ptr type,
-                                     CORBA::Visibility access,
-                                     CORBA::Environment &ACE_TRY_ENV)
+                                     CORBA::Visibility access
+                                     TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD_RETURN (CORBA_ValueMemberDef::_nil ());
@@ -393,31 +393,31 @@ TAO_ValueDef_i::create_value_member (const char *id,
                                       name,
                                       version,
                                       type,
-                                      access,
-                                      ACE_TRY_ENV);
+                                      access
+                                      TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_ValueMemberDef_ptr 
+CORBA_ValueMemberDef_ptr
 TAO_ValueDef_i::create_value_member_i (const char * /* id */,
                                        const char * /* name */,
                                        const char * /* version */,
                                        CORBA_IDLType_ptr /* type */,
-                                       CORBA::Visibility /* access */,
-                                       CORBA::Environment & /* ACE_TRY_ENV */)
+                                       CORBA::Visibility /* access */
+                                       TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_AttributeDef_ptr 
+CORBA_AttributeDef_ptr
 TAO_ValueDef_i::create_attribute (
     const char *id,
     const char *name,
     const char *version,
     CORBA_IDLType_ptr type,
-    CORBA::AttributeMode mode,
-    CORBA::Environment &ACE_TRY_ENV
+    CORBA::AttributeMode mode
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -427,18 +427,18 @@ TAO_ValueDef_i::create_attribute (
                                    name,
                                    version,
                                    type,
-                                   mode,
-                                   ACE_TRY_ENV);
+                                   mode
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_AttributeDef_ptr 
+CORBA_AttributeDef_ptr
 TAO_ValueDef_i::create_attribute_i (
     const char * /* id */,
     const char * /* name */,
     const char * /* version */,
     CORBA_IDLType_ptr /* type */,
-    CORBA::AttributeMode /* mode */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    CORBA::AttributeMode /* mode */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -446,7 +446,7 @@ TAO_ValueDef_i::create_attribute_i (
   return 0;
 }
 
-CORBA_OperationDef_ptr 
+CORBA_OperationDef_ptr
 TAO_ValueDef_i::create_operation (
     const char *id,
     const char *name,
@@ -455,8 +455,8 @@ TAO_ValueDef_i::create_operation (
     CORBA::OperationMode mode,
     const CORBA_ParDescriptionSeq &params,
     const CORBA_ExceptionDefSeq &exceptions,
-    const CORBA_ContextIdSeq &contexts,
-    CORBA::Environment &ACE_TRY_ENV
+    const CORBA_ContextIdSeq &contexts
+    TAO_ENV_ARG_DECL
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
@@ -469,11 +469,11 @@ TAO_ValueDef_i::create_operation (
                                    mode,
                                    params,
                                    exceptions,
-                                   contexts,
-                                   ACE_TRY_ENV);
+                                   contexts
+                                   TAO_ENV_ARG_PARAMETER);
 }
 
-CORBA_OperationDef_ptr 
+CORBA_OperationDef_ptr
 TAO_ValueDef_i::create_operation_i (
     const char * /* id */,
     const char * /* name */,
@@ -482,8 +482,8 @@ TAO_ValueDef_i::create_operation_i (
     CORBA::OperationMode /* mode */,
     const CORBA_ParDescriptionSeq & /* params */,
     const CORBA_ExceptionDefSeq & /* exceptions */,
-    const CORBA_ContextIdSeq & /* contexts */,
-    CORBA::Environment & /* ACE_TRY_ENV */
+    const CORBA_ContextIdSeq & /* contexts */
+    TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */
   )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
diff --git a/TAO/orbsvcs/IFR_Service/ValueDef_i.h b/TAO/orbsvcs/IFR_Service/ValueDef_i.h
index f0d79461aba..4bd20588fd8 100644
--- a/TAO/orbsvcs/IFR_Service/ValueDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ValueDef_i.h
@@ -34,8 +34,8 @@
 #pragma warning(disable:4250)
 #endif /* _MSC_VER */
 
-class TAO_ValueDef_i : public virtual TAO_Container_i, 
-                       public virtual TAO_Contained_i, 
+class TAO_ValueDef_i : public virtual TAO_Container_i,
+                       public virtual TAO_Contained_i,
                        public virtual TAO_IDLType_i
 {
   // = TITLE
@@ -53,270 +53,230 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's pure virtual function.
 
   virtual CORBA_InterfaceDefSeq *supported_interfaces (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InterfaceDefSeq *supported_interfaces_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void supported_interfaces (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void supported_interfaces_i (
-      const CORBA_InterfaceDefSeq & supported_interfaces,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InterfaceDefSeq & supported_interfaces
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_InitializerSeq *initializers (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_InitializerSeq *initializers_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void initializers (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void initializers_i (
-      const CORBA_InitializerSeq & initializers,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_InitializerSeq & initializers
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef_ptr base_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef_ptr base_value_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void base_value (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void base_value_i (
-      CORBA_ValueDef_ptr base_value,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_ValueDef_ptr base_value
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDefSeq *abstract_base_values (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDefSeq *abstract_base_values_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void abstract_base_values (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void abstract_base_values_i (
-      const CORBA_ValueDefSeq & abstract_base_values,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ValueDefSeq & abstract_base_values
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_abstract (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_abstract_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_abstract (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_abstract_i (
-      CORBA::Boolean is_abstract,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_abstract
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_custom (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_custom_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_custom (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_custom_i (
-      CORBA::Boolean is_custom,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_custom
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_truncatable (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_truncatable_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void is_truncatable (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void is_truncatable_i (
-      CORBA::Boolean is_truncatable,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Boolean is_truncatable
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Boolean is_a (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Boolean is_a_i (
-      const char *id,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const char *id
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueDef::FullValueDescription *describe_value (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));      
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueDef::FullValueDescription *describe_value_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
-    ACE_THROW_SPEC ((CORBA::SystemException));      
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
+    ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_ValueMemberDef_ptr create_value_member (
       const char *id,
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_ValueMemberDef_ptr create_value_member_i (
@@ -324,10 +284,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_AttributeDef_ptr create_attribute (
@@ -335,10 +294,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_AttributeDef_ptr create_attribute_i (
@@ -346,10 +304,9 @@ public:
       const char *name,
       const char *version,
       CORBA_IDLType_ptr type,
-      CORBA::AttributeMode mode,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::AttributeMode mode
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_OperationDef_ptr create_operation (
@@ -360,10 +317,9 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_OperationDef_ptr create_operation_i (
@@ -374,10 +330,9 @@ public:
       CORBA::OperationMode mode,
       const CORBA_ParDescriptionSeq &params,
       const CORBA_ExceptionDefSeq &exceptions,
-      const CORBA_ContextIdSeq &contexts,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      const CORBA_ContextIdSeq &contexts
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp
index aa8bb89e0e5..e99f4fcd66e 100644
--- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.cpp
@@ -20,129 +20,129 @@ TAO_ValueMemberDef_i::~TAO_ValueMemberDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_ValueMemberDef_i::def_kind (CORBA::Environment &)
+TAO_ValueMemberDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_ValueMember;
 }
 
-void 
-TAO_ValueMemberDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueMemberDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueMemberDef_i::destroy_i (CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueMemberDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
 CORBA_Contained::Description *
-TAO_ValueMemberDef_i::describe (CORBA::Environment &ACE_TRY_ENV)
+TAO_ValueMemberDef_i::describe (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->describe_i (ACE_TRY_ENV);
+  return this->describe_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 CORBA_Contained::Description *
-TAO_ValueMemberDef_i::describe_i (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_ValueMemberDef_i::describe_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueMemberDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_ValueMemberDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_ValueMemberDef_i::type_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA::TypeCode_ptr
+TAO_ValueMemberDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-CORBA_IDLType_ptr 
-TAO_ValueMemberDef_i::type_def (CORBA::Environment &ACE_TRY_ENV)
+CORBA_IDLType_ptr
+TAO_ValueMemberDef_i::type_def (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA_IDLType::_nil ());
 
-  return this->type_def_i (ACE_TRY_ENV);
+  return this->type_def_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA_IDLType_ptr 
-TAO_ValueMemberDef_i::type_def_i (CORBA::Environment & /* ACE_TRY_ENV */)
+CORBA_IDLType_ptr
+TAO_ValueMemberDef_i::type_def_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueMemberDef_i::type_def (CORBA_IDLType_ptr type_def,
-                                CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueMemberDef_i::type_def (CORBA_IDLType_ptr type_def
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->type_def_i (type_def,
-                    ACE_TRY_ENV);
+  this->type_def_i (type_def
+                    TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueMemberDef_i::type_def_i (CORBA_IDLType_ptr /* type_def */,
-                                  CORBA::Environment & /* ACE_TRY_ENV */)
+void
+TAO_ValueMemberDef_i::type_def_i (CORBA_IDLType_ptr /* type_def */
+                                  TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
 }
 
-CORBA::Visibility 
-TAO_ValueMemberDef_i::access (CORBA::Environment &ACE_TRY_ENV)
+CORBA::Visibility
+TAO_ValueMemberDef_i::access (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->access_i (ACE_TRY_ENV);
+  return this->access_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::Visibility 
-TAO_ValueMemberDef_i::access_i (CORBA::Environment & /* ACE_TRY_ENV */ )
+CORBA::Visibility
+TAO_ValueMemberDef_i::access_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
   return 0;
 }
 
-void 
-TAO_ValueMemberDef_i::access (CORBA::Visibility access,
-                              CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_ValueMemberDef_i::access (CORBA::Visibility access
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->access (access,
-                ACE_TRY_ENV);
+  this->access (access
+                TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_ValueMemberDef_i::access_i (CORBA::Visibility /* access */,
-                                CORBA::Environment & /* ACE_TRY_ENV */ )
+void
+TAO_ValueMemberDef_i::access_i (CORBA::Visibility /* access */
+                                TAO_ENV_ARG_DECL_NOT_USED /* TAO_ENV_SINGLE_ARG_PARAMETER */ )
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO
diff --git a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h
index 59e35bc2aa7..3fdd11ea192 100644
--- a/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/ValueMemberDef_i.h
@@ -50,101 +50,86 @@ public:
   // Destructor
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_Contained::Description *describe (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA_Contained::Description *describe_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From Contained_i's pure virtual function.
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA_IDLType_ptr type_def (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA_IDLType_ptr type_def_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void type_def (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void type_def_i (
-      CORBA_IDLType_ptr type_def,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA_IDLType_ptr type_def
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::Visibility access (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::Visibility access_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void access (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void access_i (
-      CORBA::Visibility access,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::Visibility access
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
index 58ed597e2ec..96e5401bc90 100644
--- a/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
+++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.cpp
@@ -20,23 +20,23 @@ TAO_WstringDef_i::~TAO_WstringDef_i (void)
 }
 
 CORBA::DefinitionKind
-TAO_WstringDef_i::def_kind (CORBA::Environment &)
+TAO_WstringDef_i::def_kind (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return CORBA::dk_Wstring;
 }
 
-void 
-TAO_WstringDef_i::destroy (CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_WstringDef_i::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->destroy_i (ACE_TRY_ENV);
+  this->destroy_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-void 
-TAO_WstringDef_i::destroy_i (CORBA::Environment &)
+void
+TAO_WstringDef_i::destroy_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TString name;
@@ -49,37 +49,37 @@ TAO_WstringDef_i::destroy_i (CORBA::Environment &)
                                           0);
 }
 
-CORBA::TypeCode_ptr 
-TAO_WstringDef_i::type (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_WstringDef_i::type (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->type_i (ACE_TRY_ENV);
+  return this->type_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-CORBA::TypeCode_ptr 
-TAO_WstringDef_i::type_i (CORBA::Environment &ACE_TRY_ENV)
+CORBA::TypeCode_ptr
+TAO_WstringDef_i::type_i (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  CORBA::ULong bound = this->bound_i (ACE_TRY_ENV);
+  CORBA::ULong bound = this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::TypeCode::_nil ());
 
-  return this->repo_->tc_factory ()->create_wstring_tc (bound,
-                                                        ACE_TRY_ENV);
+  return this->repo_->tc_factory ()->create_wstring_tc (bound
+                                                        TAO_ENV_ARG_PARAMETER);
 }
-CORBA::ULong 
-TAO_WstringDef_i::bound (CORBA::Environment &ACE_TRY_ENV)
+CORBA::ULong
+TAO_WstringDef_i::bound (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_READ_GUARD_RETURN (0);
 
-  return this->bound_i (ACE_TRY_ENV);
+  return this->bound_i (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 
-CORBA::ULong 
-TAO_WstringDef_i::bound_i (CORBA::Environment &)
+CORBA::ULong
+TAO_WstringDef_i::bound_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   u_int retval = 0;
@@ -90,20 +90,20 @@ TAO_WstringDef_i::bound_i (CORBA::Environment &)
   return ACE_static_cast (CORBA::ULong, retval);
 }
 
-void 
-TAO_WstringDef_i::bound (CORBA::ULong bound,
-                         CORBA::Environment &ACE_TRY_ENV)
+void
+TAO_WstringDef_i::bound (CORBA::ULong bound
+                         TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_IFR_WRITE_GUARD;
 
-  this->bound_i (bound,
-                 ACE_TRY_ENV);
+  this->bound_i (bound
+                 TAO_ENV_ARG_PARAMETER);
 }
 
-void 
-TAO_WstringDef_i::bound_i (CORBA::ULong bound,
-                           CORBA::Environment &)
+void
+TAO_WstringDef_i::bound_i (CORBA::ULong bound
+                           TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->repo_->config ()->set_integer_value (this->section_key_,
diff --git a/TAO/orbsvcs/IFR_Service/WstringDef_i.h b/TAO/orbsvcs/IFR_Service/WstringDef_i.h
index ff243a9ccdb..80c3387cfb0 100644
--- a/TAO/orbsvcs/IFR_Service/WstringDef_i.h
+++ b/TAO/orbsvcs/IFR_Service/WstringDef_i.h
@@ -51,63 +51,54 @@ public:
   // Destructor.
 
   virtual CORBA::DefinitionKind def_kind (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Return our definition kind.
 
   virtual void destroy (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Remove the repository entry.
 
   virtual void destroy_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual CORBA::TypeCode_ptr type (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
   virtual CORBA::TypeCode_ptr type_i (
-      CORBA::Environment &ACE_TRY_ENV =
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
   // From IDLType_i's virtual function.
 
   virtual CORBA::ULong bound (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   CORBA::ULong bound_i (
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual void bound (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void bound_i (
-      CORBA::ULong bound,
-      CORBA::Environment &ACE_TRY_ENV = 
-        TAO_default_environment ()
-    )
+      CORBA::ULong bound
+      TAO_ENV_ARG_DECL_WITH_DEFAULTS)
+
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/orbsvcs/IFR_Service/be_produce.cpp b/TAO/orbsvcs/IFR_Service/be_produce.cpp
index 299d407c046..4733035164f 100644
--- a/TAO/orbsvcs/IFR_Service/be_produce.cpp
+++ b/TAO/orbsvcs/IFR_Service/be_produce.cpp
@@ -65,7 +65,7 @@ trademarks or registered trademarks of Sun Microsystems, Inc.
  */
 
 // BE_produce.cc - Produce the work of the BE - does nothing in the
-//		   dummy BE
+//                 dummy BE
 
 #include "idl.h"
 #include "idl_extern.h"
@@ -93,22 +93,22 @@ BE_cleanup (void)
   idl_global = 0;
 
   // Remove the holding scope entry from the repository.
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var result =
-        be_global->repository ()->lookup_id (be_global->holding_scope_name (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (be_global->holding_scope_name ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (result.in ()))
         {
           CORBA_ModuleDef_var scope =
-            CORBA_ModuleDef::_narrow (result.in (),
-                                      ACE_TRY_ENV);
+            CORBA_ModuleDef::_narrow (result.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          scope->destroy (ACE_TRY_ENV);
+          scope->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -140,18 +140,18 @@ TAO_IFR_BE_Export int
 BE_ifr_init (int &ac,
              char *av[])
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       be_global->orb (CORBA::ORB_init (ac,
                                        av,
-                                       0,
-                                       ACE_TRY_ENV));
+                                       0
+                                       TAO_ENV_ARG_PARAMETER));
       ACE_TRY_CHECK;
 
       CORBA::Object_var object =
-        be_global->orb ()->resolve_initial_references ("InterfaceRepository",
-                                                       ACE_TRY_ENV);
+        be_global->orb ()->resolve_initial_references ("InterfaceRepository"
+                                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -164,8 +164,8 @@ BE_ifr_init (int &ac,
           );
         }
 
-      CORBA_Repository_var repo = CORBA_Repository::_narrow (object.in (),
-                                                             ACE_TRY_ENV);
+      CORBA_Repository_var repo = CORBA_Repository::_narrow (object.in ()
+                                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (repo.in ()))
@@ -191,16 +191,16 @@ BE_ifr_init (int &ac,
 
   return 0;
 }
- 
+
 void
-BE_create_holding_scope (CORBA::Environment &ACE_TRY_ENV)
+BE_create_holding_scope (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA_ModuleDef_ptr scope = CORBA_ModuleDef::_nil ();
 
   // If we are multi-threaded, it may already be created.
   CORBA_Contained_var result =
-    be_global->repository ()->lookup_id (be_global->holding_scope_name (),
-                                         ACE_TRY_ENV);
+    be_global->repository ()->lookup_id (be_global->holding_scope_name ()
+                                         TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   if (CORBA::is_nil (result.in ()))
@@ -209,15 +209,15 @@ BE_create_holding_scope (CORBA::Environment &ACE_TRY_ENV)
         be_global->repository ()->create_module (
                                       be_global->holding_scope_name (),
                                       be_global->holding_scope_name (),
-                                      "1.0",
-                                      ACE_TRY_ENV
+                                      "1.0"
+                                      TAO_ENV_ARG_PARAMETER
                                     );
       ACE_CHECK;
     }
   else
     {
-      scope = CORBA_ModuleDef::_narrow (result.in (),
-                                        ACE_TRY_ENV);
+      scope = CORBA_ModuleDef::_narrow (result.in ()
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 
@@ -228,10 +228,10 @@ BE_create_holding_scope (CORBA::Environment &ACE_TRY_ENV)
 TAO_IFR_BE_Export void
 BE_produce (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      BE_create_holding_scope (ACE_TRY_ENV);
+      BE_create_holding_scope (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the root node.
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
index 532b5c0956c..ef31bb029eb 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BaseS.h.diff
@@ -44,7 +44,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -175,6 +171,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -77,7 +77,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -523,6 +521,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -110,7 +110,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1109,6 +1109,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -143,7 +143,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1481,6 +1483,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -176,7 +176,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1737,6 +1741,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
index 7ef393f6660..ce3c642d39b 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_BasicS.h.diff
@@ -45,7 +45,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -435,6 +431,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -78,7 +78,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -886,6 +884,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -111,7 +111,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1209,6 +1209,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -144,7 +144,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1668,6 +1670,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -177,7 +177,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -2152,6 +2156,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -210,7 +210,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -2476,6 +2482,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -243,7 +243,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -2774,6 +2782,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -276,7 +276,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3039,6 +3049,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -309,7 +309,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3215,6 +3227,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -342,7 +342,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3416,6 +3430,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -375,7 +375,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3626,6 +3642,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -408,7 +408,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -3885,6 +3903,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -441,7 +441,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -4169,6 +4189,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -474,7 +474,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -4636,6 +4658,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -507,7 +507,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -4984,6 +5008,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -540,7 +540,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -5447,6 +5473,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -573,7 +573,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -6035,6 +6063,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -606,7 +606,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -6532,6 +6562,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -639,7 +639,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -6964,6 +6996,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
index 0183dd4a15d..2a03ee5d895 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ComponentsS.h.diff
@@ -33,7 +33,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -400,6 +401,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +  private:
@@ -61,7 +61,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -683,6 +687,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -89,7 +89,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -963,6 +970,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -117,7 +117,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -1252,6 +1262,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -145,7 +145,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -1525,6 +1538,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -173,7 +173,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -1781,6 +1797,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -201,7 +201,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -2037,6 +2056,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -229,7 +229,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -2715,6 +2737,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -257,7 +257,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -3122,6 +3147,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -285,7 +285,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -3467,6 +3495,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -313,7 +313,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -3795,6 +3826,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
@@ -341,7 +341,7 @@
      // as soon as their use is necessary.
      void create_proxy (
 @@ -4385,6 +4419,8 @@
-       CORBA::Environment &ACE_TRY_ENV
+       TAO_ENV_SINGLE_ARG_DECL
      );
      
 +private:
diff --git a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
index c2d07095b4a..fcec20c57a1 100644
--- a/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
+++ b/TAO/orbsvcs/IFR_Service/diffs/IFR_ExtendedS.h.diff
@@ -45,7 +45,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -234,6 +230,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -78,7 +78,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -590,6 +588,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -111,7 +111,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1346,6 +1346,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
@@ -144,7 +144,7 @@
    // as soon as their use is necessary.
    void create_proxy (
 @@ -1807,6 +1809,8 @@
-     CORBA::Environment &ACE_TRY_ENV
+     TAO_ENV_SINGLE_ARG_DECL
    );
    
 +private:
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
index 90bc1795824..3b7f1e6b876 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.cpp
@@ -18,7 +18,7 @@ ifr_adding_visitor::~ifr_adding_visitor (void)
 {
 }
 
-int 
+int
 ifr_adding_visitor::visit_scope (UTL_Scope *node)
 {
   // Proceed if the number of members in our scope is greater than 0.
@@ -41,7 +41,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -")
                   ACE_TEXT (" bad node in this scope\n")
-                ), 
+                ),
                 -1
               );
             }
@@ -60,7 +60,7 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_scope -")
                   ACE_TEXT (" failed to accept visitor\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -72,16 +72,16 @@ ifr_adding_visitor::visit_scope (UTL_Scope *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
-    {  
-      this->ir_current_ = 
+    {
+      this->ir_current_ =
       be_global->repository ()->get_primitive (
-                                    this->predefined_type_to_pkind (node),
-                                    ACE_TRY_ENV
+                                    this->predefined_type_to_pkind (node)
+                                    TAO_ENV_ARG_PARAMETER
                                   );
       ACE_TRY_CHECK;
     }
@@ -89,7 +89,7 @@ ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
                            ACE_TEXT ("visit_predefined_type"));
-    
+
       return -1;
     }
   ACE_ENDTRY;
@@ -97,7 +97,7 @@ ifr_adding_visitor::visit_predefined_type (AST_PredefinedType *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_module (AST_Module *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -107,14 +107,14 @@ ifr_adding_visitor::visit_module (AST_Module *node)
 
   CORBA_Container_var new_def;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // If this module been opened before, it will already be in
       // the repository.
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -127,8 +127,8 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               new_def = container->create_module (
                                        node->repoID (),
                                        node->local_name ()->get_string (),
-                                       this->gen_version (node),
-                                       ACE_TRY_ENV
+                                       this->gen_version (node)
+                                       TAO_ENV_ARG_PARAMETER
                                      );
               ACE_TRY_CHECK;
             }
@@ -138,14 +138,14 @@ ifr_adding_visitor::visit_module (AST_Module *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
         }
       else
         {
-          CORBA::DefinitionKind kind = prev_def->def_kind (ACE_TRY_ENV);
+          CORBA::DefinitionKind kind = prev_def->def_kind (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // If the line below is true, we are clobbering a previous
@@ -154,7 +154,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
           // original entry, create the new one, and let the user beware.
           if (kind != CORBA::dk_Module)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the brach where prev_def.in() is 0.
@@ -163,8 +163,8 @@ ifr_adding_visitor::visit_module (AST_Module *node)
           else
             {
               new_def =
-                CORBA_Container::_narrow (prev_def.in (),
-                                          ACE_TRY_ENV);
+                CORBA_Container::_narrow (prev_def.in ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -175,7 +175,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
               ACE_TEXT (" scope push failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -186,7 +186,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -199,7 +199,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_module -")
               ACE_TEXT (" scope pop failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -216,7 +216,7 @@ ifr_adding_visitor::visit_module (AST_Module *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_interface (AST_Interface *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -230,20 +230,20 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
       return this->visit_valuetype (node);
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this interface already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          int status = this->create_interface_def (node,
-                                                   ACE_TRY_ENV);
+          int status = this->create_interface_def (node
+                                                   TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           return status;
@@ -251,9 +251,9 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
       else
         {
           // There is already an entry in the repository. If the interface is
-          // defined and has not already been populated, we do so 
+          // defined and has not already been populated, we do so
           // now. If it is not yet defined or the full definition has already
-          // been added to the repository, we just update the current IR object 
+          // been added to the repository, we just update the current IR object
           // holder.
           if (node->is_defined () && node->ifr_added () == 0)
             {
@@ -268,17 +268,17 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // previous IFR entry, then create a new one.
               if (node->ifr_fwd_added () == 0)
                 {
-                  prev_def->destroy (ACE_TRY_ENV);
+                  prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
-                  int status = this->create_interface_def (node,
-                                                           ACE_TRY_ENV);
+                  int status = this->create_interface_def (node
+                                                           TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   return status;
                 }
 
-              CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong, 
+              CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong,
                                                         node->n_inherits ());
 
               CORBA_InterfaceDefSeq bases (n_parents);
@@ -290,28 +290,28 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // Construct a list of the parents.
               for (CORBA::ULong i = 0; i < n_parents; ++i)
                 {
-                  result = 
-                    be_global->repository ()->lookup_id (parents[i]->repoID (),
-                                                         ACE_TRY_ENV);
+                  result =
+                    be_global->repository ()->lookup_id (parents[i]->repoID ()
+                                                         TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   // If one of our interface's parents is not in the repository,
                   // that means that it has not yet been seen (even as a
                   // forward declaration) in the IDL file, and we will have to
-                  // postpone the populating of our interface until they are all 
+                  // postpone the populating of our interface until they are all
                   // added.
                   if (CORBA::is_nil (result.in ()))
                     {
                       this->ir_current_ =
-                        CORBA_IDLType::_narrow (prev_def.in (),
-                                                ACE_TRY_ENV);
+                        CORBA_IDLType::_narrow (prev_def.in ()
+                                                TAO_ENV_ARG_PARAMETER);
                       ACE_TRY_CHECK
 
                       return 0;
                     }
 
-                  bases[i] = CORBA_InterfaceDef::_narrow (result.in (),
-                                                          ACE_TRY_ENV);
+                  bases[i] = CORBA_InterfaceDef::_narrow (result.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   if (CORBA::is_nil (bases[i].in ()))
@@ -321,19 +321,19 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                           ACE_TEXT ("visit_interface -")
                           ACE_TEXT (" CORBA_InterfaceDef::_narrow failed\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
                 }
 
               CORBA_InterfaceDef_var extant_def =
-                CORBA_InterfaceDef::_narrow (prev_def. in (),
-                                             ACE_TRY_ENV);
+                CORBA_InterfaceDef::_narrow (prev_def. in ()
+                                             TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              extant_def->base_interfaces (bases,
-                                           ACE_TRY_ENV);
+              extant_def->base_interfaces (bases
+                                           TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK
 
               node->ifr_added (1);
@@ -346,7 +346,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
                       ACE_TEXT (" scope push failed\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
@@ -359,7 +359,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
                       ACE_TEXT (" visit_scope failed\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
@@ -369,7 +369,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // The front end will already have fully defined it, so all
               // the info is available anywhere. So it's a good idea to
               // update the current IR object holder now.
-              this->ir_current_ = 
+              this->ir_current_ =
                 CORBA_IDLType::_duplicate (extant_def.in ());
 
               CORBA_Container_ptr used_scope = CORBA_Container::_nil ();
@@ -382,7 +382,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                       ACE_TEXT ("visit_interface -")
                       ACE_TEXT (" scope pop failed\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
@@ -395,8 +395,8 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
               // not defined/added - not possible.
               // defined/not added - takes the other branch.
               // defined/added - we're ok.
-              this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in (),
-                                                          ACE_TRY_ENV);
+              this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in ()
+                                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -413,7 +413,7 @@ ifr_adding_visitor::visit_interface (AST_Interface *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -423,13 +423,13 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 
   AST_Interface *i = node->full_definition ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this interface already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (i->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (i->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -443,7 +443,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
           bases.length (0);
 
           CORBA_Container_ptr current_scope = CORBA_Container::_nil ();
-  
+
           if (be_global->ifr_scopes ().top (current_scope) == 0)
             {
               if (i->is_local ())
@@ -453,8 +453,8 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->repoID (),
                                        i->local_name ()->get_string (),
                                        this->gen_version (i),
-                                       bases,
-                                       ACE_TRY_ENV
+                                       bases
+                                       TAO_ENV_ARG_PARAMETER
                                      );
                 }
               else
@@ -464,8 +464,8 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                                        i->repoID (),
                                        i->local_name ()->get_string (),
                                        this->gen_version (i),
-                                       bases,
-                                       ACE_TRY_ENV
+                                       bases
+                                       TAO_ENV_ARG_PARAMETER
                                      );
                 }
 
@@ -478,7 +478,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
                   ACE_TEXT ("visit_interface_fwd -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -493,7 +493,7 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch of
@@ -503,8 +503,8 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
 
           // There is already an entry in the repository, so just update
           // the current IR object holder.
-          this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in (),
-                                                      ACE_TRY_ENV);
+          this->ir_current_ = CORBA_IDLType::_narrow (prev_def.in ()
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -522,19 +522,19 @@ ifr_adding_visitor::visit_interface_fwd (AST_InterfaceFwd *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_valuetype (AST_Interface *)
 {
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_valuetype_fwd (AST_InterfaceFwd *)
 {
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_structure (AST_Structure *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -542,12 +542,12 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -573,15 +573,15 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return this->visit_structure (node);
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -597,7 +597,7 @@ ifr_adding_visitor::visit_structure (AST_Structure *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_exception (AST_Exception *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -613,7 +613,7 @@ ifr_adding_visitor::visit_exception (AST_Exception *node)
   return visitor.visit_exception (node);
 }
 
-int 
+int
 ifr_adding_visitor::visit_enum (AST_Enum *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -621,20 +621,20 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = 
-            ACE_static_cast (CORBA::ULong, 
+          CORBA::ULong member_count =
+            ACE_static_cast (CORBA::ULong,
                              node->member_count ());
 
           CORBA_EnumMemberSeq members (member_count);
@@ -647,7 +647,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
             {
               member_name = node->value_to_name (i);
 
-              members[i] = 
+              members[i] =
                 CORBA::string_dup (
                     member_name->last_component ()->get_string ()
                   );
@@ -662,8 +662,8 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
                     node->repoID (),
                     node->local_name ()->get_string (),
                     this->gen_version (node),
-                    members,
-                    ACE_TRY_ENV
+                    members
+                    TAO_ENV_ARG_PARAMETER
                   );
               ACE_TRY_CHECK;
             }
@@ -673,7 +673,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_enum -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -688,7 +688,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return this->visit_enum (node);
@@ -696,9 +696,9 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
 
           // There is already an entry in the repository, so just update
           // the current IR object holder.
-          this->ir_current_ = 
-            CORBA_EnumDef::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_EnumDef::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -714,7 +714,7 @@ ifr_adding_visitor::visit_enum (AST_Enum *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_operation (AST_Operation *node)
 {
   ifr_adding_visitor_operation visitor (node);
@@ -722,7 +722,7 @@ ifr_adding_visitor::visit_operation (AST_Operation *node)
   return visitor.visit_operation (node);
 }
 
-int 
+int
 ifr_adding_visitor::visit_field (AST_Field *node)
 {
   AST_Type *ft = AST_Type::narrow_from_decl (node->field_type ());
@@ -734,7 +734,7 @@ ifr_adding_visitor::visit_field (AST_Field *node)
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
           ACE_TEXT ("visit_field - ")
           ACE_TEXT ("Bad field type\n")
-        ), 
+        ),
         -1
       );
     }
@@ -746,7 +746,7 @@ ifr_adding_visitor::visit_field (AST_Field *node)
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
           ACE_TEXT ("visit_field - ")
           ACE_TEXT ("failed to accept visitor\n")
-        ), 
+        ),
         -1
       );
     }
@@ -754,29 +754,29 @@ ifr_adding_visitor::visit_field (AST_Field *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_attribute (AST_Attribute *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       AST_Type *type = node->field_type ();
 
       // Updates ir_current_.
-      this->get_referenced_type (type,
-                                 ACE_TRY_ENV);
+      this->get_referenced_type (type
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      CORBA::AttributeMode mode = 
+      CORBA::AttributeMode mode =
         node->readonly () ? CORBA::ATTR_READONLY : CORBA::ATTR_NORMAL;
 
       CORBA_Container_ptr current_scope = CORBA_Container::_nil ();
 
       if (be_global->ifr_scopes ().top (current_scope) == 0)
         {
-          CORBA_InterfaceDef_var iface = 
-            CORBA_InterfaceDef::_narrow (current_scope,
-                                         ACE_TRY_ENV);
+          CORBA_InterfaceDef_var iface =
+            CORBA_InterfaceDef::_narrow (current_scope
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_AttributeDef_var new_def =
@@ -784,8 +784,8 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
                                      node->local_name ()->get_string (),
                                      this->gen_version (node),
                                      this->ir_current_.in (),
-                                     mode,
-                                     ACE_TRY_ENV);
+                                     mode
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -794,7 +794,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_attribute -")
               ACE_TEXT (" scope stack is empty\n")
-            ),  
+            ),
             -1
           );
         }
@@ -811,7 +811,7 @@ ifr_adding_visitor::visit_attribute (AST_Attribute *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_union (AST_Union *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -819,12 +819,12 @@ ifr_adding_visitor::visit_union (AST_Union *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -850,15 +850,15 @@ ifr_adding_visitor::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               return this->visit_union (node);
             }
 
           this->ir_current_ =
-            CORBA_UnionDef::_narrow (prev_def.in (),
-                                     ACE_TRY_ENV);
+            CORBA_UnionDef::_narrow (prev_def.in ()
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -874,7 +874,7 @@ ifr_adding_visitor::visit_union (AST_Union *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_constant (AST_Constant *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -884,12 +884,12 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 
   const char *id = node->repoID ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (id,
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (id
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Nothing prevents this constant's repo id from already being
@@ -905,7 +905,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
           else
@@ -920,9 +920,9 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
 
       CORBA::PrimitiveKind pkind = this->expr_type_to_pkind (ev->et);
 
-      CORBA_IDLType_var idl_type = 
-        be_global->repository ()->get_primitive (pkind,
-                                                 ACE_TRY_ENV);
+      CORBA_IDLType_var idl_type =
+        be_global->repository ()->get_primitive (pkind
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any any;
@@ -940,8 +940,8 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
                 node->local_name ()->get_string (),
                 this->gen_version (node),
                 idl_type.in (),
-                any,
-                ACE_TRY_ENV
+                any
+                TAO_ENV_ARG_PARAMETER
               );
           ACE_TRY_CHECK;
         }
@@ -951,7 +951,7 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_constant -")
               ACE_TEXT (" scope stack is empty\n")
-            ),  
+            ),
             -1
           );
         }
@@ -968,25 +968,25 @@ ifr_adding_visitor::visit_constant (AST_Constant *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_array (AST_Array *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->element_type (node->base_type (),
-                          ACE_TRY_ENV);
+      this->element_type (node->base_type ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       AST_Expression **dims = node->dims ();
 
       for (unsigned long i = node->n_dims (); i > 0; --i)
         {
-          this->ir_current_ = 
+          this->ir_current_ =
             be_global->repository ()->create_array (
                 dims[i - 1]->ev ()->u.ulval,
-                this->ir_current_.in (),
-                ACE_TRY_ENV
+                this->ir_current_.in ()
+                TAO_ENV_ARG_PARAMETER
               );
           ACE_TRY_CHECK;
         }
@@ -1003,21 +1003,21 @@ ifr_adding_visitor::visit_array (AST_Array *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_sequence (AST_Sequence *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->element_type (node->base_type (),
-                          ACE_TRY_ENV);
+      this->element_type (node->base_type ()
+                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->ir_current_ =
         be_global->repository ()->create_sequence (
                                       node->max_size ()->ev ()->u.ulval,
-                                      this->ir_current_.in (),
-                                      ACE_TRY_ENV
+                                      this->ir_current_.in ()
+                                      TAO_ENV_ARG_PARAMETER
                                     );
       ACE_TRY_CHECK;
     }
@@ -1033,7 +1033,7 @@ ifr_adding_visitor::visit_sequence (AST_Sequence *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_string (AST_String *node)
 {
   AST_Expression *ex = node->max_size ();
@@ -1042,20 +1042,20 @@ ifr_adding_visitor::visit_string (AST_String *node)
 
   CORBA::ULong bound = ACE_static_cast (CORBA::ULong, ev->u.ulval);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       if (node->node_type () == AST_Decl::NT_string)
         {
           this->ir_current_ =
-            be_global->repository ()->create_string (bound,
-                                                     ACE_TRY_ENV);
+            be_global->repository ()->create_string (bound
+                                                     TAO_ENV_ARG_PARAMETER);
         }
       else
         {
           this->ir_current_ =
-            be_global->repository ()->create_wstring (bound,
-                                                      ACE_TRY_ENV);
+            be_global->repository ()->create_wstring (bound
+                                                      TAO_ENV_ARG_PARAMETER);
         }
 
       ACE_TRY_CHECK;
@@ -1072,7 +1072,7 @@ ifr_adding_visitor::visit_string (AST_String *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_typedef (AST_Typedef *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -1080,33 +1080,33 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this typedef already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          this->element_type (node->base_type (),
-                              ACE_TRY_ENV);
+          this->element_type (node->base_type ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_Container_ptr current_scope = CORBA_Container::_nil ();
 
           if (be_global->ifr_scopes ().top (current_scope) == 0)
             {
-              this->ir_current_ = 
+              this->ir_current_ =
                 current_scope->create_alias (
                    node->repoID (),
                    node->local_name ()->get_string (),
                    this->gen_version (node),
-                   this->ir_current_.in (),
-                   ACE_TRY_ENV
+                   this->ir_current_.in ()
+                   TAO_ENV_ARG_PARAMETER
                  );
               ACE_TRY_CHECK;
             }
@@ -1116,7 +1116,7 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_typedef -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -1131,16 +1131,16 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
               return this->visit_typedef (node);
             }
 
-          this->ir_current_ = 
-            CORBA_TypedefDef::_narrow (prev_def.in (),
-                                       ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_TypedefDef::_narrow (prev_def.in ()
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1156,15 +1156,15 @@ ifr_adding_visitor::visit_typedef (AST_Typedef *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_root (AST_Root *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      CORBA_Container_var new_scope = 
-        CORBA_Container::_narrow (be_global->repository (),
-                                  ACE_TRY_ENV);
+      CORBA_Container_var new_scope =
+        CORBA_Container::_narrow (be_global->repository ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
@@ -1173,7 +1173,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -")
               ACE_TEXT (" scope push failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1184,7 +1184,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1197,7 +1197,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_root -")
               ACE_TEXT (" scope pop failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1214,7 +1214,7 @@ ifr_adding_visitor::visit_root (AST_Root *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor::visit_native (AST_Native *node)
 {
   if (node->imported () && !be_global->do_included_files ())
@@ -1222,12 +1222,12 @@ ifr_adding_visitor::visit_native (AST_Native *node)
       return 0;
     }
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -1240,8 +1240,8 @@ ifr_adding_visitor::visit_native (AST_Native *node)
                 current_scope->create_native (
                     node->repoID (),
                     node->local_name ()->get_string (),
-                    this->gen_version (node),
-                    ACE_TRY_ENV
+                    this->gen_version (node)
+                    TAO_ENV_ARG_PARAMETER
                   );
               ACE_TRY_CHECK;
             }
@@ -1251,7 +1251,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_native -")
                   ACE_TEXT (" scope stack is empty\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -1266,7 +1266,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -1274,8 +1274,8 @@ ifr_adding_visitor::visit_native (AST_Native *node)
             }
 
           this->ir_current_ =
-            CORBA_NativeDef::_narrow (prev_def.in (),
-                                      ACE_TRY_ENV);
+            CORBA_NativeDef::_narrow (prev_def.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -1291,7 +1291,7 @@ ifr_adding_visitor::visit_native (AST_Native *node)
   return 0;
 }
 
-CORBA::PrimitiveKind 
+CORBA::PrimitiveKind
 ifr_adding_visitor::expr_type_to_pkind (AST_Expression::ExprType et)
 {
   switch (et)
@@ -1337,7 +1337,7 @@ ifr_adding_visitor::expr_type_to_pkind (AST_Expression::ExprType et)
     }
 }
 
-CORBA::PrimitiveKind 
+CORBA::PrimitiveKind
 ifr_adding_visitor::predefined_type_to_pkind (AST_PredefinedType *node)
 {
   switch (node->pt ())
@@ -1394,7 +1394,7 @@ ifr_adding_visitor::predefined_type_to_pkind (AST_PredefinedType *node)
     }
 }
 
-void 
+void
 ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev,
                               CORBA::Any &any)
 {
@@ -1429,7 +1429,7 @@ ifr_adding_visitor::load_any (AST_Expression::AST_ExprValue *ev,
 #if 0
     case AST_Expression::EV_longdouble:
     // Not implemented in IDL compiler.
-#endif      
+#endif
     case AST_Expression::EV_char:
       any <<= CORBA::Any::from_char (ev->u.cval);
       break;
@@ -1475,9 +1475,9 @@ ifr_adding_visitor::gen_version (AST_Decl *)
   return "1.0";
 }
 
-void 
-ifr_adding_visitor::element_type (AST_Type *base_type,
-                                  CORBA::Environment &ACE_TRY_ENV)
+void
+ifr_adding_visitor::element_type (AST_Type *base_type
+                                  TAO_ENV_ARG_DECL)
 {
   if (base_type->anonymous ())
     {
@@ -1492,9 +1492,9 @@ ifr_adding_visitor::element_type (AST_Type *base_type,
     }
   else
     {
-      CORBA_Contained_var contained = 
-        be_global->repository ()->lookup_id (base_type->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var contained =
+        be_global->repository ()->lookup_id (base_type->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       if (CORBA::is_nil (contained.in ()))
@@ -1506,17 +1506,17 @@ ifr_adding_visitor::element_type (AST_Type *base_type,
             ));
         }
 
-      this->ir_current_ = CORBA_IDLType::_narrow (contained.in (),
-                                                  ACE_TRY_ENV);
+      this->ir_current_ = CORBA_IDLType::_narrow (contained.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
 
 int
-ifr_adding_visitor::create_interface_def (AST_Interface *node,
-                                          CORBA::Environment &ACE_TRY_ENV)
+ifr_adding_visitor::create_interface_def (AST_Interface *node
+                                          TAO_ENV_ARG_DECL)
 {
-  CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong, 
+  CORBA::ULong n_parents = ACE_static_cast (CORBA::ULong,
                                             node->n_inherits ());
 
   CORBA_InterfaceDefSeq bases (n_parents);
@@ -1537,18 +1537,18 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               LM_ERROR,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface - call for parent node failed\n")
-            ),  
+            ),
             -1
           );
         }
 
-      result = 
-        be_global->repository ()->lookup_id (parents[i]->repoID (),
-                                             ACE_TRY_ENV);
+      result =
+        be_global->repository ()->lookup_id (parents[i]->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
-      bases[i] = CORBA_InterfaceDef::_narrow (result.in (),
-                                              ACE_TRY_ENV);
+      bases[i] = CORBA_InterfaceDef::_narrow (result.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (CORBA::is_nil (bases[i].in ()))
@@ -1558,14 +1558,14 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface -")
               ACE_TEXT (" CORBA_InterfaceDef::_narrow failed\n")
-            ),  
+            ),
             -1
           );
         }
     }
 
   CORBA_Container_ptr current_scope = CORBA_Container::_nil ();
-  
+
   if (be_global->ifr_scopes ().top (current_scope) == 0)
     {
       CORBA_InterfaceDef_var new_def;
@@ -1577,8 +1577,8 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
                                node->repoID (),
                                node->local_name ()->get_string (),
                                this->gen_version (node),
-                               bases,
-                               ACE_TRY_ENV
+                               bases
+                               TAO_ENV_ARG_PARAMETER
                              );
         }
       else
@@ -1588,8 +1588,8 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
                                node->repoID (),
                                node->local_name ()->get_string (),
                                this->gen_version (node),
-                               bases,
-                               ACE_TRY_ENV
+                               bases
+                               TAO_ENV_ARG_PARAMETER
                              );
         }
 
@@ -1599,8 +1599,8 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
 
       // Push the new IR object onto the scope stack.
       CORBA_Container_var new_scope =
-        CORBA_Container::_narrow (new_def.in (),
-                                  ACE_TRY_ENV);
+        CORBA_Container::_narrow (new_def.in ()
+                                  TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
 
       if (be_global->ifr_scopes ().push (new_scope.in ()) != 0)
@@ -1610,7 +1610,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface -")
               ACE_TEXT (" scope push failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1623,7 +1623,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1634,7 +1634,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
       // the info in available anywhere. So it's a good idea to
       // update the current IR object holder now. This will
       // consume the objref pointer.
-      this->ir_current_ = 
+      this->ir_current_ =
         CORBA_IDLType::_duplicate (new_def.in ());
 
       CORBA_Container_ptr used_scope = CORBA_Container::_nil ();
@@ -1647,7 +1647,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
               ACE_TEXT ("(%N:%l) ifr_adding_visitor::")
               ACE_TEXT ("visit_interface -")
               ACE_TEXT (" scope pop failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -1658,7 +1658,7 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
           LM_ERROR,
           ACE_TEXT ("(%N:%l) ifr_adding_visitor::visit_interface -")
           ACE_TEXT (" scope stack is empty\n")
-        ),  
+        ),
         -1
       );
     }
@@ -1667,8 +1667,8 @@ ifr_adding_visitor::create_interface_def (AST_Interface *node,
 }
 
 void
-ifr_adding_visitor::get_referenced_type (AST_Type *node,
-                                         CORBA::Environment &ACE_TRY_ENV)
+ifr_adding_visitor::get_referenced_type (AST_Type *node
+                                         TAO_ENV_ARG_DECL)
 {
   switch (node->node_type ())
   {
@@ -1690,20 +1690,19 @@ ifr_adding_visitor::get_referenced_type (AST_Type *node,
             ));
         }
 
-      ACE_UNUSED_ARG (ACE_TRY_ENV); // FUZZ: ignore check_for_ace_check
       break;
     // For names types, we can just look up the entry and update
     // ir_current_.
     default:
       {
         CORBA_Contained_var prev_def =
-          be_global->repository ()->lookup_id (node->repoID (),
-                                               ACE_TRY_ENV);
+          be_global->repository ()->lookup_id (node->repoID ()
+                                               TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
 
         this->ir_current_ =
-          CORBA_IDLType::_narrow (prev_def.in (),
-                                  ACE_TRY_ENV);
+          CORBA_IDLType::_narrow (prev_def.in ()
+                                  TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
         break;
       }
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
index 6fdc248558b..b93ecc2f061 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor.h
@@ -119,17 +119,17 @@ protected:
   const char *gen_version (AST_Decl *node);
   // Defaults to "1.0" for now.
 
-  void element_type (AST_Type *base_type,
-                     CORBA::Environment &ACE_TRY_ENV);
+  void element_type (AST_Type *base_type
+                     TAO_ENV_ARG_DECL);
   // Creates or looks up the element type of an array or sequence,
   // and stores the result in ir_current_.
 
-  int create_interface_def (AST_Interface *node,
-                            CORBA::Environment &ACE_TRY_ENV);
+  int create_interface_def (AST_Interface *node
+                            TAO_ENV_ARG_DECL);
   // Common code factored out of visit_interface().
 
-  void get_referenced_type (AST_Type *node,
-                            CORBA::Environment &ACE_TRY_ENV);
+  void get_referenced_type (AST_Type *node
+                            TAO_ENV_ARG_DECL);
   // Utility method to update ir_current_ for struct members, union
   // members, operation parameters and operation return types.
 
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
index 8ae7be9837e..29fac8c4193 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_exception.cpp
@@ -36,7 +36,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 
   AST_Field **f = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Visit each field.
@@ -49,7 +49,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                   ACE_TEXT ("visit_scope -")
                   ACE_TEXT (" field node access failed\n")
-                ), 
+                ),
                 -1
               );
             }
@@ -69,7 +69,7 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
                       ACE_TEXT ("visit_scope -")
                       ACE_TEXT (" failed to accept visitor\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
@@ -77,20 +77,19 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft,
-                                         ACE_TRY_ENV);
+              this->get_referenced_type (ft TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
-          this->members_[i].name = 
+          this->members_[i].name =
             CORBA::string_dup ((*f)->local_name ()->get_string ());
 
           // IfR method create_exception does not use this - it just needs
           // to be non-zero for marshaling.
-          this->members_[i].type = 
+          this->members_[i].type =
             CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-          this->members_[i].type_def = 
+          this->members_[i].type_def =
             CORBA_IDLType::_duplicate (this->ir_current_.in ());
         }
     }
@@ -111,13 +110,13 @@ ifr_adding_visitor_exception::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this union already in the respository?
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -134,9 +133,9 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
               this->ir_current_ =
                 CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-              CORBA_Contained_ptr tmp = 
-                CORBA_Contained::_narrow (visitor.ir_current (),
-                                          ACE_TRY_ENV);
+              CORBA_Contained_ptr tmp =
+                CORBA_Contained::_narrow (visitor.ir_current ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing ExceptionDef hasn't been created
@@ -156,7 +155,7 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -164,8 +163,8 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -186,12 +185,12 @@ ifr_adding_visitor_exception::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (prev_def.in ()))
@@ -202,7 +201,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will create a new EnumDef entry.
@@ -222,7 +221,7 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
               ACE_TEXT ("visit_exception -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -236,17 +235,17 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_exception::")
               ACE_TEXT ("visit_exception -")
               ACE_TEXT (" scope stack is empty\n")
-            ),  
+            ),
             -1
           );
         }
 
-      CORBA_ExceptionDef_var new_def = 
+      CORBA_ExceptionDef_var new_def =
         current_scope->create_exception (node->repoID (),
                                          node->local_name ()->get_string (),
                                          this->gen_version (node),
-                                         this->members_,
-                                         ACE_TRY_ENV);
+                                         this->members_
+                                         TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -257,24 +256,24 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
           CORBA_Contained_var traveller;
 
           CORBA_Container_var new_container =
-            CORBA_Container::_narrow (new_def.in (),
-                                      ACE_TRY_ENV);
+            CORBA_Container::_narrow (new_def.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           for (size_t i = 0; i < size; ++i)
             {
               this->move_queue_.dequeue_head (traveller);
 
-              CORBA::String_var name = traveller->name (ACE_TRY_ENV);
+              CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              CORBA::String_var version = traveller->version (ACE_TRY_ENV);
+              CORBA::String_var version = traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               traveller->move (new_container.in (),
                                name.in (),
-                               version.in (),
-                               ACE_TRY_ENV);
+                               version.in ()
+                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
         }
@@ -298,19 +297,19 @@ ifr_adding_visitor_exception::visit_exception (AST_Exception *node)
 int
 ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong, 
+          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong,
                                                        node->member_count ());
 
           CORBA_EnumMemberSeq members (member_count);
@@ -323,7 +322,7 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
             {
               member_name = node->value_to_name (i);
 
-              members[i] = 
+              members[i] =
                 CORBA::string_dup (
                     member_name->last_component ()->get_string ()
                   );
@@ -334,14 +333,14 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
                                           node->repoID (),
                                           node->local_name ()->get_string (),
                                           this->gen_version (node),
-                                          members,
-                                          ACE_TRY_ENV
+                                          members
+                                          TAO_ENV_ARG_PARAMETER
                                         );
           ACE_TRY_CHECK;
 
-          CORBA_Contained_ptr tmp = 
-            CORBA_Contained::_narrow (this->ir_current_.in (),
-                                      ACE_TRY_ENV);
+          CORBA_Contained_ptr tmp =
+            CORBA_Contained::_narrow (this->ir_current_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->move_queue_.enqueue_tail (tmp);
@@ -356,16 +355,16 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
               return this->visit_enum (node);
             }
 
-          this->ir_current_ = 
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -386,13 +385,13 @@ ifr_adding_visitor_exception::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_exception::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this union already in the respository?
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -409,9 +408,9 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
               this->ir_current_ =
                 CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-              CORBA_Contained_ptr tmp = 
-                CORBA_Contained::_narrow (visitor.ir_current (),
-                                          ACE_TRY_ENV);
+              CORBA_Contained_ptr tmp =
+                CORBA_Contained::_narrow (visitor.ir_current ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing ExceptionDef hasn't been created
@@ -431,7 +430,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -439,8 +438,8 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -458,7 +457,7 @@ ifr_adding_visitor_exception::visit_union (AST_Union *node)
   return 0;
 }
 
-CORBA_IDLType_ptr 
+CORBA_IDLType_ptr
 ifr_adding_visitor_exception::ir_current (void) const
 {
   return this->ir_current_.in ();
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
index c22bf56b2b2..b714b59a91b 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_operation.cpp
@@ -17,10 +17,10 @@ ifr_adding_visitor_operation::~ifr_adding_visitor_operation (void)
 {
 }
 
-int 
+int
 ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // If this operation is already in the repository (for example, if
@@ -29,8 +29,8 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       // compiler front end would have told us.
 
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (!CORBA::is_nil (prev_def.in ()))
@@ -42,7 +42,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       // will look up each parameter and add its repository entry to
       // our params_ member.
 
-      CORBA::ULong length = ACE_static_cast (CORBA::ULong, 
+      CORBA::ULong length = ACE_static_cast (CORBA::ULong,
                                              node->argument_count ());
 
       this->params_.length (length);
@@ -54,7 +54,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_operation::")
               ACE_TEXT ("visit_operation -")
               ACE_TEXT (" visit_scope failed\n")
-            ),  
+            ),
             -1
           );
         }
@@ -87,12 +87,12 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
           ex = ex_iter.item ();
 
           prev_def =
-            be_global->repository ()->lookup_id (ex->repoID (),
-                                                 ACE_TRY_ENV);
+            be_global->repository ()->lookup_id (ex->repoID ()
+                                                 TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          exceptions[i++] = CORBA_ExceptionDef::_narrow (prev_def.in (),
-                                                         ACE_TRY_ENV);
+          exceptions[i++] = CORBA_ExceptionDef::_narrow (prev_def.in ()
+                                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ex_iter.next ();
@@ -133,13 +133,13 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
       AST_Type *return_type = node->return_type ();
 
       // Updates ir_current_.
-      this->get_referenced_type (return_type,
-                                 ACE_TRY_ENV);
+      this->get_referenced_type (return_type
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Is the operation oneway?
-      CORBA::OperationMode mode = node->flags () == AST_Operation::OP_oneway 
-                                 ? CORBA::OP_ONEWAY 
+      CORBA::OperationMode mode = node->flags () == AST_Operation::OP_oneway
+                                 ? CORBA::OP_ONEWAY
                                  : CORBA::OP_NORMAL;
 
       // Create the repository entry.
@@ -148,9 +148,9 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
 
       if (be_global->ifr_scopes ().top (current_scope) == 0)
         {
-          CORBA_InterfaceDef_var iface = 
-            CORBA_InterfaceDef::_narrow (current_scope,
-                                         ACE_TRY_ENV);
+          CORBA_InterfaceDef_var iface =
+            CORBA_InterfaceDef::_narrow (current_scope
+                                         TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA_OperationDef_var new_def =
@@ -161,8 +161,8 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
                                      mode,
                                      this->params_,
                                      exceptions,
-                                     contexts,
-                                     ACE_TRY_ENV);
+                                     contexts
+                                     TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -172,7 +172,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
               ACE_TEXT ("(%N:%l) ifr_adding_visitor_operation::")
               ACE_TEXT ("visit_operation -")
               ACE_TEXT (" scope stack is empty\n")
-            ),  
+            ),
             -1
           );
         }
@@ -191,7 +191,7 @@ ifr_adding_visitor_operation::visit_operation (AST_Operation *node)
   return 0;
 }
 
-int 
+int
 ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
 {
   // Get the parameter's name.
@@ -199,21 +199,21 @@ ifr_adding_visitor_operation::visit_argument (AST_Argument *node)
 
   AST_Type *arg_type = node->field_type ();
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Updates ir_current_.
-      this->get_referenced_type (arg_type,
-                                 ACE_TRY_ENV);
+      this->get_referenced_type (arg_type
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      this->params_[this->index_].type_def = 
+      this->params_[this->index_].type_def =
         CORBA_IDLType::_duplicate (this->ir_current_.in ());
 
 
-      // Fortunately, AST_Field::Direction and CORBA_ParameterMode 
+      // Fortunately, AST_Field::Direction and CORBA_ParameterMode
       // are ordered identically.
-      this->params_[this->index_].mode = 
+      this->params_[this->index_].mode =
         (CORBA::ParameterMode) node->direction ();
 
       // IfR method create_operation does not use this - it just needs
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
index d8eb9bacc49..5a68cd87383 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_structure.cpp
@@ -39,7 +39,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 
   AST_Field **f = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Visit each field.
@@ -52,7 +52,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                   ACE_TEXT ("visit_scope -")
                   ACE_TEXT (" field node access failed\n")
-                ), 
+                ),
                 -1
               );
             }
@@ -80,7 +80,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                           ACE_TEXT ("visit_scope -")
                           ACE_TEXT (" failed to accept visitor\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
@@ -88,9 +88,9 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                   this->ir_current_ =
                     CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-                  CORBA_Contained_ptr tmp = 
-                    CORBA_Contained::_narrow (visitor.ir_current (),
-                                              ACE_TRY_ENV);
+                  CORBA_Contained_ptr tmp =
+                    CORBA_Contained::_narrow (visitor.ir_current ()
+                                              TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   this->move_queue_.enqueue_tail (tmp);
@@ -104,7 +104,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                           ACE_TEXT ("visit_scope -")
                           ACE_TEXT (" failed to accept visitor\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
@@ -113,12 +113,12 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft,
-                                         ACE_TRY_ENV);
+              this->get_referenced_type (ft
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
-          this->members_[i].name = 
+          this->members_[i].name =
             CORBA::string_dup ((*f)->local_name ()->get_string ());
 
           // IfR method create_struct does not use this - it just needs
@@ -126,7 +126,7 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
           this->members_[i].type =
             CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-          this->members_[i].type_def = 
+          this->members_[i].type_def =
             CORBA_IDLType::_duplicate (this->ir_current_.in ());
         }
     }
@@ -147,12 +147,12 @@ ifr_adding_visitor_structure::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -164,20 +164,20 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                   ACE_TEXT ("visit_structure -")
                   ACE_TEXT (" visit_scope failed\n")
-                ),  
+                ),
                 -1
               );
             }
 
           if (this->is_nested_)
             {
-              this->ir_current_ = 
+              this->ir_current_ =
                 be_global->holding_scope ()->create_struct (
                     node->repoID (),
                     node->local_name ()->get_string (),
                     this->gen_version (node),
-                    this->members_,
-                    ACE_TRY_ENV
+                    this->members_
+                    TAO_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -191,18 +191,18 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor_structure::")
                       ACE_TEXT ("visit_structure -")
                       ACE_TEXT (" scope stack is empty\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
 
-              this->ir_current_ = 
+              this->ir_current_ =
                 current_scope->create_struct (
                                    node->repoID (),
                                    node->local_name ()->get_string (),
                                    this->gen_version (node),
-                                   this->members_,
-                                   ACE_TRY_ENV
+                                   this->members_
+                                   TAO_ENV_ARG_PARAMETER
                                 );
             }
 
@@ -215,25 +215,25 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
               CORBA_Contained_var traveller;
 
               CORBA_Container_var new_container =
-                CORBA_Container::_narrow (this->ir_current_.in (),
-                                          ACE_TRY_ENV);
+                CORBA_Container::_narrow (this->ir_current_.in ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               for (size_t i = 0; i < size; ++i)
                 {
                   this->move_queue_.dequeue_head (traveller);
 
-                  CORBA::String_var name = traveller->name (ACE_TRY_ENV);
+                  CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
-                  CORBA::String_var version = 
-                    traveller->version (ACE_TRY_ENV);
+                  CORBA::String_var version =
+                    traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   traveller->move (new_container.in (),
                                    name.in (),
-                                   version.in (),
-                                   ACE_TRY_ENV);
+                                   version.in ()
+                                   TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -248,7 +248,7 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -256,8 +256,8 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -278,19 +278,19 @@ ifr_adding_visitor_structure::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong, 
+          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong,
                                                        node->member_count ());
 
           CORBA_EnumMemberSeq members (member_count);
@@ -303,7 +303,7 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
             {
               member_name = node->value_to_name (i);
 
-              members[i] = 
+              members[i] =
                 CORBA::string_dup (
                     member_name->last_component ()->get_string ()
                   );
@@ -314,14 +314,14 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
                                           node->repoID (),
                                           node->local_name ()->get_string (),
                                           this->gen_version (node),
-                                          members,
-                                          ACE_TRY_ENV
+                                          members
+                                          TAO_ENV_ARG_PARAMETER
                                         );
           ACE_TRY_CHECK;
 
-          CORBA_Contained_ptr tmp = 
-            CORBA_Contained::_narrow (this->ir_current_.in (),
-                                      ACE_TRY_ENV);
+          CORBA_Contained_ptr tmp =
+            CORBA_Contained::_narrow (this->ir_current_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Since the enclosing StructDef hasn't been created
@@ -340,16 +340,16 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
               return this->visit_enum (node);
             }
 
-          this->ir_current_ = 
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -370,13 +370,13 @@ ifr_adding_visitor_structure::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_structure::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this union already in the respository?
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -393,9 +393,9 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
               this->ir_current_ =
                 CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-              CORBA_Contained_ptr tmp = 
-                CORBA_Contained::_narrow (visitor.ir_current (),
-                                          ACE_TRY_ENV);
+              CORBA_Contained_ptr tmp =
+                CORBA_Contained::_narrow (visitor.ir_current ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing StructDef hasn't been created
@@ -415,7 +415,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -423,8 +423,8 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -442,7 +442,7 @@ ifr_adding_visitor_structure::visit_union (AST_Union *node)
   return 0;
 }
 
-CORBA_IDLType_ptr 
+CORBA_IDLType_ptr
 ifr_adding_visitor_structure::ir_current (void) const
 {
   return this->ir_current_.in ();
diff --git a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
index 647e861c4fb..aea10197d74 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_adding_visitor_union.cpp
@@ -42,7 +42,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
   // Index into members_.
   CORBA::ULong index = 0;
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Visit each field.
@@ -55,7 +55,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                   ACE_TEXT ("visit_scope -")
                   ACE_TEXT (" field node access failed\n")
-                ), 
+                ),
                 -1
               );
             }
@@ -83,7 +83,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                           ACE_TEXT ("visit_scope -")
                           ACE_TEXT (" failed to accept visitor\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
@@ -91,9 +91,9 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                   this->ir_current_ =
                     CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-                  CORBA_Contained_ptr tmp = 
-                    CORBA_Contained::_narrow (visitor.ir_current (),
-                                              ACE_TRY_ENV);
+                  CORBA_Contained_ptr tmp =
+                    CORBA_Contained::_narrow (visitor.ir_current ()
+                                              TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   this->move_queue_.enqueue_tail (tmp);
@@ -107,7 +107,7 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                           ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                           ACE_TEXT ("visit_scope -")
                           ACE_TEXT (" failed to accept visitor\n")
-                        ),  
+                        ),
                         -1
                       );
                     }
@@ -116,8 +116,8 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
           else
             {
               // Updates ir_current_.
-              this->get_referenced_type (ft,
-                                         ACE_TRY_ENV);
+              this->get_referenced_type (ft
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -172,15 +172,15 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
                   this->members_[index].label <<= CORBA::Any::from_octet (0);
                 }
 
-              this->members_[index].name = 
+              this->members_[index].name =
                 CORBA::string_dup ((*f)->local_name ()->get_string ());
 
               // IfR method create_union does not use this - it just needs
               // to be non-zero for marshaling.
-              this->members_[index].type = 
+              this->members_[index].type =
                 CORBA::TypeCode::_duplicate (CORBA::_tc_void);
 
-              this->members_[index++].type_def = 
+              this->members_[index++].type_def =
                 CORBA_IDLType::_duplicate (this->ir_current_.in ());
             }
         }
@@ -202,13 +202,13 @@ ifr_adding_visitor_union::visit_scope (UTL_Scope *node)
 int
 ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this struct already in the respository?
-      CORBA_Contained_var prev_def = 
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+      CORBA_Contained_var prev_def =
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
@@ -225,9 +225,9 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
               this->ir_current_ =
                 CORBA_IDLType::_duplicate (visitor.ir_current ());
 
-              CORBA_Contained_ptr tmp = 
-                CORBA_Contained::_narrow (visitor.ir_current (),
-                                          ACE_TRY_ENV);
+              CORBA_Contained_ptr tmp =
+                CORBA_Contained::_narrow (visitor.ir_current ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Since the enclosing UnionDef hasn't been created
@@ -247,7 +247,7 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -255,8 +255,8 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -277,19 +277,19 @@ ifr_adding_visitor_union::visit_structure (AST_Structure *node)
 int
 ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Is this enum already in the respository?
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If not, create a new entry.
       if (CORBA::is_nil (prev_def.in ()))
         {
-          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong, 
+          CORBA::ULong member_count = ACE_static_cast (CORBA::ULong,
                                                        node->member_count ());
 
           CORBA_EnumMemberSeq members (member_count);
@@ -302,7 +302,7 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
             {
               member_name = node->value_to_name (i);
 
-              members[i] = 
+              members[i] =
                 CORBA::string_dup (member_name->last_component ()->get_string ());
             }
 
@@ -311,14 +311,14 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
                                           node->repoID (),
                                           node->local_name ()->get_string (),
                                           this->gen_version (node),
-                                          members,
-                                          ACE_TRY_ENV
+                                          members
+                                          TAO_ENV_ARG_PARAMETER
                                         );
           ACE_TRY_CHECK;
 
-          CORBA_Contained_ptr tmp = 
-            CORBA_Contained::_narrow (this->ir_current_.in (),
-                                      ACE_TRY_ENV);
+          CORBA_Contained_ptr tmp =
+            CORBA_Contained::_narrow (this->ir_current_.in ()
+                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Since the enclosing UnionDef hasn't been created
@@ -337,16 +337,16 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
               return this->visit_enum (node);
             }
 
-          this->ir_current_ = 
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+          this->ir_current_ =
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -367,12 +367,12 @@ ifr_adding_visitor_union::visit_enum (AST_Enum *node)
 int
 ifr_adding_visitor_union::visit_union (AST_Union *node)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA_Contained_var prev_def =
-        be_global->repository ()->lookup_id (node->repoID (),
-                                             ACE_TRY_ENV);
+        be_global->repository ()->lookup_id (node->repoID ()
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (prev_def.in ()))
@@ -386,8 +386,8 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           if (disc_type->node_type () == AST_Decl::NT_enum)
             {
               CORBA_Contained_var disc_def =
-                be_global->repository ()->lookup_id (disc_type->repoID (),
-                                                     ACE_TRY_ENV);
+                be_global->repository ()->lookup_id (disc_type->repoID ()
+                                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (CORBA::is_nil (disc_def.in ()))
@@ -397,17 +397,17 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                       ACE_TEXT ("visit_union -")
                       ACE_TEXT (" discriminator not found in repository\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
 
               CORBA_IDLType_var idl_def =
-                CORBA_IDLType::_narrow (disc_def.in (),
-                                        ACE_TRY_ENV);
+                CORBA_IDLType::_narrow (disc_def.in ()
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              this->disc_tc_ = idl_def->type (ACE_TRY_ENV);
+              this->disc_tc_ = idl_def->type (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -417,7 +417,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::visit_union -")
                   ACE_TEXT (" visit_scope failed\n")
-                ),  
+                ),
                 -1
               );
             }
@@ -429,21 +429,21 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                   LM_ERROR,
                   ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::visit_union -")
                   ACE_TEXT (" failed to accept visitor\n")
-                ),  
+                ),
                 -1
               );
             }
 
           if (this->is_nested_)
             {
-              this->ir_current_ = 
+              this->ir_current_ =
                 be_global->holding_scope ()->create_union (
                     node->repoID (),
                     node->local_name ()->get_string (),
                     this->gen_version (node),
                     this->ir_current_.in (),
-                    this->members_,
-                    ACE_TRY_ENV
+                    this->members_
+                    TAO_ENV_ARG_PARAMETER
                   );
             }
           else
@@ -457,19 +457,19 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
                       ACE_TEXT ("(%N:%l) ifr_adding_visitor_union::")
                       ACE_TEXT ("visit_union -")
                       ACE_TEXT (" scope stack is empty\n")
-                    ),  
+                    ),
                     -1
                   );
                 }
 
-              this->ir_current_ = 
+              this->ir_current_ =
                 current_scope->create_union (
                                    node->repoID (),
                                    node->local_name ()->get_string (),
                                    this->gen_version (node),
                                    this->ir_current_.in (),
-                                   this->members_,
-                                   ACE_TRY_ENV
+                                   this->members_
+                                   TAO_ENV_ARG_PARAMETER
                                 );
             }
 
@@ -482,25 +482,25 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
               CORBA_Contained_var traveller;
 
               CORBA_Container_var new_container =
-                CORBA_Container::_narrow (this->ir_current_.in (),
-                                          ACE_TRY_ENV);
+                CORBA_Container::_narrow (this->ir_current_.in ()
+                                          TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               for (size_t i = 0; i < size; ++i)
                 {
                   this->move_queue_.dequeue_head (traveller);
 
-                  CORBA::String_var name = traveller->name (ACE_TRY_ENV);
+                  CORBA::String_var name = traveller->name (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
-                  CORBA::String_var version = 
-                    traveller->version (ACE_TRY_ENV);
+                  CORBA::String_var version =
+                    traveller->version (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   traveller->move (new_container.in (),
                                    name.in (),
-                                   version.in (),
-                                   ACE_TRY_ENV);
+                                   version.in ()
+                                   TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -515,7 +515,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
           // original entry, create the new one, and let the user beware.
           if (node->ifr_added () == 0)
             {
-              prev_def->destroy (ACE_TRY_ENV);
+              prev_def->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // This call will take the other branch.
@@ -523,8 +523,8 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
             }
 
           this->ir_current_ =
-            CORBA_IDLType::_narrow (prev_def.in (),
-                                    ACE_TRY_ENV);
+            CORBA_IDLType::_narrow (prev_def.in ()
+                                    TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
@@ -542,7 +542,7 @@ ifr_adding_visitor_union::visit_union (AST_Union *node)
   return 0;
 }
 
-CORBA_IDLType_ptr 
+CORBA_IDLType_ptr
 ifr_adding_visitor_union::ir_current (void) const
 {
   return this->ir_current_.in ();
diff --git a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
index 2a3baece26a..8baa46d085f 100644
--- a/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
+++ b/TAO/orbsvcs/IFR_Service/ifr_removing_visitor.cpp
@@ -14,7 +14,7 @@ ifr_removing_visitor::~ifr_removing_visitor (void)
 {
 }
 
-int 
+int
 ifr_removing_visitor::visit_scope (UTL_Scope *node)
 {
   // Proceed if the number of members in our scope is greater than 0.
@@ -26,7 +26,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
 
       AST_Decl *d = 0;
 
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           // Continue until each element is visited.
@@ -40,7 +40,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
                       LM_ERROR,
                       ACE_TEXT ("(%N:%l) ifr_removing_visitor::visit_scope -")
                       ACE_TEXT (" bad node in this scope\n")
-                    ), 
+                    ),
                     -1
                   );
                 }
@@ -52,9 +52,9 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
                   continue;
                 }
 
-              CORBA_Contained_var top_level = 
-                be_global->repository ()->lookup_id (d->repoID (),
-                                                     ACE_TRY_ENV);
+              CORBA_Contained_var top_level =
+                be_global->repository ()->lookup_id (d->repoID ()
+                                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               if (!CORBA::is_nil (top_level.in ()))
@@ -62,7 +62,7 @@ ifr_removing_visitor::visit_scope (UTL_Scope *node)
                   // All we have to do is call destroy() on each IR object
                   // in the global scope, because destroy() works on all
                   // the contents recursively.
-                  top_level->destroy (ACE_TRY_ENV);
+                  top_level->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
 
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.cpp b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
index 53aabcd739f..6edb2e11821 100644
--- a/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/ImplRepo.cpp
@@ -13,7 +13,7 @@ run_standalone (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      int status = server.init (ACE_TRY_ENV);
+      int status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -22,10 +22,10 @@ run_standalone (void)
         }
       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/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/NT_Service.cpp b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp
index d4f32bb11c1..4d8c96055aa 100644
--- a/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp
+++ b/TAO/orbsvcs/ImplRepo_Service/NT_Service.cpp
@@ -79,7 +79,7 @@ ImR_NT_Service::svc (void)
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      status = server.init (ACE_TRY_ENV);
+      status = server.init (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -89,10 +89,10 @@ ImR_NT_Service::svc (void)
       else
         {
           report_status (SERVICE_RUNNING);
-          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/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/Criteria_Evaluator.cpp b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
index 452b8c9a24f..ba2e7bf843c 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.cpp
@@ -27,7 +27,7 @@ Criteria_Evaluator::~Criteria_Evaluator ()
 }
 
 LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *
-Criteria_Evaluator::getInitialization (CORBA::Environment &ACE_TRY_ENV)
+Criteria_Evaluator::getInitialization (TAO_ENV_SINGLE_ARG_DECL)
 {
   LifeCycleService::Criteria_Evaluator::SeqNamedValuePair *sequence_ptr = 0;
 
@@ -45,7 +45,7 @@ Criteria_Evaluator::getInitialization (CORBA::Environment &ACE_TRY_ENV)
 }
 
 char *
-Criteria_Evaluator::getFilter (CORBA::Environment &ACE_TRY_ENV)
+Criteria_Evaluator::getFilter (TAO_ENV_SINGLE_ARG_DECL)
 {
   const char* string;
   CORBA::Any value;
diff --git a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
index b55af2bd9e0..13569acd21f 100644
--- a/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
+++ b/TAO/orbsvcs/LifeCycle_Service/Criteria_Evaluator.h
@@ -28,16 +28,16 @@ public:
   Criteria_Evaluator (const CosLifeCycle::Criteria &criteria);
   ~Criteria_Evaluator (void);
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (CORBA::Environment &);
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getInitialization (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
-  char * getFilter (CORBA::Environment &);
+  char * getFilter (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
 
-  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (CORBA::Environment &)
+  LifeCycleService::Criteria_Evaluator::SeqNamedValuePair * getLogicalLocation (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     {
       return 0;
     }
 
-  char * getPreferences (CORBA::Environment &)
+  char * getPreferences (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     {
       return 0;
     }
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/NT_Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
index 7c7a3bbf997..780268c7dd4 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Server.cpp
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// *- C++ -*-
+
 // $Id$
 
 // ============================================================================
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
index 47ca133bdfb..0127b397ab9 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.cpp
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 #include /**/ "NT_Naming_Service.h"
@@ -136,7 +137,7 @@ TAO_NT_Naming_Service::svc (void)
   ACE_TRY
     {
       report_status (SERVICE_RUNNING);
-      naming_service.run (ACE_TRY_ENV);
+      naming_service.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
index 4124bc9e881..cdc168ab353 100644
--- a/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/NT_Naming_Service.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // ============================================================================
diff --git a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
index e21bdf26485..23dff06b24e 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
+++ b/TAO/orbsvcs/Naming_Service/Naming_Server.cpp
@@ -15,7 +15,7 @@ main (int argc, char *argv[])
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY
     {
-      naming_service.run (ACE_TRY_ENV);
+      naming_service.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
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/Naming_Service/Naming_Service.h b/TAO/orbsvcs/Naming_Service/Naming_Service.h
index 0d0fc4576ec..b7d9970a70c 100644
--- a/TAO/orbsvcs/Naming_Service/Naming_Service.h
+++ b/TAO/orbsvcs/Naming_Service/Naming_Service.h
@@ -42,7 +42,7 @@ public:
   virtual int init (int argc, char *argv[]);
   // Initialize the Naming Service with the arguments.
 
-  int run (CORBA_Environment& ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Run the TAO_Naming_Service.
 
   virtual ~TAO_Naming_Service (void);
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/Scheduling_Service/Scheduling_Service.h b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
index d04423f9799..f741fb60e6b 100644
--- a/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
+++ b/TAO/orbsvcs/Scheduling_Service/Scheduling_Service.h
@@ -51,7 +51,7 @@ public:
   int init (int argc, char *argv[]);
   // Initialize the Scheduling Service with the arguments.
 
-  int run (CORBA_Environment& ACE_TRY_ENV);
+  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Run the TAO_Scheduling_Service.
 
   ~TAO_Scheduling_Service (void);
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/ConsumerAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
index 362875858cc..87e69d4fa69 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.cpp
@@ -26,14 +26,14 @@ TAO_CosEC_ConsumerAdmin_i::init (const RtecEventChannelAdmin::ConsumerQOS &consu
 }
 
 CosEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxysupplier_nil =
     CosEventChannelAdmin::ProxyPushSupplier::_nil ();
 
   RtecEventChannelAdmin::ProxyPushSupplier_var rtecproxypushsupplier =
-    this->rtec_consumeradmin_->obtain_push_supplier (ACE_TRY_ENV);
+    this->rtec_consumeradmin_->obtain_push_supplier (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxysupplier_nil);
 
   TAO_CosEC_ProxyPushSupplier_i *proxypushsupplier;
@@ -47,11 +47,11 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV
     auto_proxysupplier (proxypushsupplier);
 
   CosEventChannelAdmin::ProxyPushSupplier_ptr proxy_obj =
-    auto_proxysupplier.get ()->_this (ACE_TRY_ENV);
+    auto_proxysupplier.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxysupplier_nil);
 
    // give the ownership to the POA.
-  auto_proxysupplier.get ()->_remove_ref (ACE_TRY_ENV);
+  auto_proxysupplier.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxysupplier_nil);
 
   auto_proxysupplier.release ();
@@ -59,7 +59,7 @@ TAO_CosEC_ConsumerAdmin_i::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV
 }
 
 CosEventChannelAdmin::ProxyPullSupplier_ptr
-TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (CORBA::Environment &)
+TAO_CosEC_ConsumerAdmin_i::obtain_pull_supplier (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
index cba88a57bcb..d27a0bc2575 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/ConsumerAdmin_i.h
@@ -55,12 +55,12 @@ public:
             RtecEventChannelAdmin::ConsumerAdmin_ptr rtec_consumeradmin);
 
   virtual CosEventChannelAdmin::ProxyPushSupplier_ptr
-    obtain_push_supplier(CORBA::Environment &ACE_TRY_ENV)
+    obtain_push_supplier(TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPushSupplier_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullSupplier_ptr
-    obtain_pull_supplier(CORBA::Environment &ACE_TRY_ENV)
+    obtain_pull_supplier(TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPullSupplier_ptr.
 
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/lib/SupplierAdmin_i.cpp b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
index 64e839f82b4..688c8982937 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.cpp
@@ -26,14 +26,14 @@ TAO_CosEC_SupplierAdmin_i::init (const RtecEventChannelAdmin::SupplierQOS &suppl
 }
 
 CosEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxyconsumer_nil =
     CosEventChannelAdmin::ProxyPushConsumer::_nil ();
 
   RtecEventChannelAdmin::ProxyPushConsumer_var rtecproxypushconsumer =
-    this->rtec_supplieradmin_->obtain_push_consumer (ACE_TRY_ENV);
+    this->rtec_supplieradmin_->obtain_push_consumer (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxyconsumer_nil);
 
   TAO_CosEC_ProxyPushConsumer_i *proxypushconsumer;
@@ -46,11 +46,11 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV
     auto_proxyconsumer (proxypushconsumer);
 
   CosEventChannelAdmin::ProxyPushConsumer_ptr proxy_obj =
-    auto_proxyconsumer.get ()->_this (ACE_TRY_ENV);
+    auto_proxyconsumer.get ()->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxyconsumer_nil);
 
    // give the ownership to the POA.
-  auto_proxyconsumer.get ()->_remove_ref (ACE_TRY_ENV);
+  auto_proxyconsumer.get ()->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (proxyconsumer_nil);
 
   auto_proxyconsumer.release ();
@@ -58,7 +58,7 @@ TAO_CosEC_SupplierAdmin_i::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV
 }
 
 CosEventChannelAdmin::ProxyPullConsumer_ptr
-TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (CORBA::Environment &)
+TAO_CosEC_SupplierAdmin_i::obtain_pull_consumer (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
       ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // TODO: implement this.
diff --git a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
index 8150bbb2e90..04ea411c3fc 100644
--- a/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
+++ b/TAO/orbsvcs/examples/CosEC/RtEC_Based/lib/SupplierAdmin_i.h
@@ -57,12 +57,12 @@ public:
   // error.
 
   virtual CosEventChannelAdmin::ProxyPushConsumer_ptr
-    obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+    obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPushConsumer_ptr.
 
   virtual CosEventChannelAdmin::ProxyPullConsumer_ptr
-    obtain_pull_consumer(CORBA::Environment &ACE_TRY_ENV)
+    obtain_pull_consumer(TAO_ENV_SINGLE_ARG_DECL)
       ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns a new ProxyPullConsumer_ptr.
 
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/CosEC/Simple/Supplier.h b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
index 2e4bcb2cc21..ba082729cc7 100644
--- a/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/CosEC/Simple/Supplier.h
@@ -40,7 +40,7 @@ public:
 
   // = The CosEventComm::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/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 187b799e1ae..3e1348e7544 100644
--- a/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
+++ b/TAO/orbsvcs/examples/RtEC/MCast/MCast.cpp
@@ -1,5 +1,6 @@
 // $Id$
 
+
 #include "Consumer.h"
 #include "Supplier.h"
 #include "AddrServer.h"
@@ -11,7 +12,9 @@
 #include "tao/ORB_Core.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(EC_Examples, MCast, "$Id$")
+ACE_RCSID (EC_Examples,
+           MCast,
+           "$Id$")
 
 const char *udp_mcast_address =
     ACE_DEFAULT_MULTICAST_ADDR ":10001";
@@ -34,32 +37,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
@@ -77,15 +72,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
@@ -108,14 +103,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
@@ -152,7 +147,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
@@ -168,8 +163,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
@@ -184,7 +179,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:
@@ -201,8 +196,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)
         {
@@ -225,8 +220,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
@@ -246,7 +241,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
@@ -257,19 +252,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
@@ -282,7 +277,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)
             {
@@ -291,12 +286,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;
         }
 
@@ -305,16 +300,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)
         {
@@ -323,13 +318,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
@@ -341,24 +336,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/Schedule/Supplier.cpp b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
index 921f5d7c1bf..f60d585f1ec 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.cpp
@@ -9,7 +9,7 @@ Supplier::Supplier (void)
 }
 
 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/Schedule/Supplier.h b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
index a75bdd5b416..e6139801c49 100644
--- a/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Schedule/Supplier.h
@@ -44,7 +44,7 @@ public:
 
   // = 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/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/RtEC/Simple/Supplier.h b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
index 7410fc2d03b..72a72f74395 100644
--- a/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
+++ b/TAO/orbsvcs/examples/RtEC/Simple/Supplier.h
@@ -41,7 +41,7 @@ public:
 
   // = 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/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/SLevel1_Test_i.h b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
index beec3b6d678..7448af5dadc 100644
--- a/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/examples/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -25,10 +25,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server
   SLevel1_Server_i ();
 
   ///
-  CORBA::Boolean authorize_level1 (CORBA::Environment &)
+  CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  CORBA::Boolean authorize_level2 (CORBA::Environment &)
+  CORBA::Boolean authorize_level2 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   static int authorized_1;
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 2104699fcba..085d3bd7a44 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AVStreams_i.cpp
@@ -26,7 +26,9 @@
 #include "AVStreams_i.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(AV, AVStreams_i, "$Id$")
+ACE_RCSID (AV,
+           AVStreams_i,
+           "$Id$")
 
 //------------------------------------------------------------
 // TAO_AV_Qos
@@ -70,8 +72,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 +92,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 +103,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 +121,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 +142,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 +153,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 +173,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 +192,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 +204,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;
                 }
             }
@@ -220,9 +222,10 @@ TAO_Basic_StreamCtrl::destroy (const AVStreams::flowSpec &flow_spec,
 // Changes the QoS associated with the stream
 // 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_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      AVStreams::noSuchFlow,
                      AVStreams::QoSRequestFailed))
@@ -233,8 +236,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)
@@ -245,8 +248,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))
@@ -254,15 +257,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))
@@ -278,8 +281,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))
@@ -287,7 +290,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
@@ -319,12 +322,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;
 }
 
@@ -362,11 +365,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
@@ -384,14 +387,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;
     }
@@ -409,11 +412,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
@@ -433,10 +436,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);
@@ -473,14 +476,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;
@@ -488,13 +491,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;
         }
     }
@@ -510,14 +513,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;
@@ -526,13 +529,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;
         }
     }
@@ -549,14 +552,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;
@@ -565,13 +568,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;
         }
     }
@@ -592,8 +595,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,
@@ -641,8 +644,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)
@@ -651,22 +654,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;
 
@@ -675,8 +678,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.
@@ -714,37 +717,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;
 
@@ -753,8 +756,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;
@@ -784,13 +787,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;
         }
 
@@ -802,21 +805,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_++);
                     }
@@ -840,8 +843,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;
@@ -852,15 +855,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);
         }
@@ -874,8 +877,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;
             }
 
@@ -886,8 +889,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;
             }
@@ -907,9 +910,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;
             }
         }
@@ -922,15 +925,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;
 
@@ -939,8 +942,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);
@@ -952,8 +955,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;
             }
         }
@@ -974,8 +977,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,
@@ -998,25 +1001,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;
@@ -1034,12 +1037,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);
@@ -1052,12 +1055,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);
@@ -1121,7 +1124,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 ()))
@@ -1138,7 +1141,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 ()))
@@ -1147,28 +1150,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
@@ -1177,11 +1180,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;
@@ -1199,12 +1202,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
@@ -1212,12 +1215,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
@@ -1235,13 +1238,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;
@@ -1259,8 +1262,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);
                     }
                 }
@@ -1274,15 +1277,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;
@@ -1291,7 +1294,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))
 {
@@ -1307,13 +1310,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;
         }
     }
@@ -1328,8 +1331,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))
@@ -1338,8 +1341,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))
@@ -1348,8 +1351,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))
 {
@@ -1368,16 +1371,17 @@ TAO_StreamCtrl::get_related_vdev (AVStreams::MMDevice_ptr adev,
 }
 
 CORBA::Boolean
+
 TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_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)
@@ -1388,73 +1392,72 @@ TAO_StreamCtrl::modify_QoS (AVStreams::streamQoS &new_qos,
   else
     {
       ACE_TRY
-	{
-	  
-	  AVStreams::flowSpec in_flowspec;
-	  AVStreams::flowSpec out_flowspec;
-	  
-	  in_flowspec.length (0);
-	  out_flowspec.length (0);
-	  
-	  int in_index = 0;
-	  int out_index = 0;
-	  
-	  AVStreams::flowSpec flowspec;
-	  if (the_spec.length () == 0)
-	    {
-	      // Apply modify_qos to all the flows
-	      flowspec = this->flows_;
-	      MMDevice_Map_Iterator iterator (this->mmdevice_a_map_);
-	      MMDevice_Map::ENTRY *entry = 0;
-	      for (;iterator.next (entry) !=  0;iterator.advance ())
-		{
-		  flowspec = entry->int_id_.flowspec_;
-		}
-	    }
-	  else
-	    {
-	      flowspec = the_spec;
-	    }
-	  
-	  if (TAO_debug_level > 0)
-	    ACE_DEBUG ((LM_DEBUG,	
-			"TAO_StreamCtrl::modify_QoS\n"));
-	  
-
-	  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 ());
-		}
-	    }
-
-	  if (in_flowspec.length () != 0)
-	    {
-	      this->vdev_a_->modify_QoS (new_qos, in_flowspec, ACE_TRY_ENV);
-	      ACE_TRY_CHECK;
-	    }
-
-	  if (out_flowspec.length () != 0)
-	    {
-	      this->vdev_b_->modify_QoS (new_qos, out_flowspec, ACE_TRY_ENV);
-	      ACE_TRY_CHECK;
-	    }
-	}
+        {
+          AVStreams::flowSpec in_flowspec;
+          AVStreams::flowSpec out_flowspec;
+
+          in_flowspec.length (0);
+          out_flowspec.length (0);
+
+          int in_index = 0;
+          int out_index = 0;
+
+          AVStreams::flowSpec flowspec;
+          if (the_spec.length () == 0)
+            {
+              // Apply modify_qos to all the flows
+              flowspec = this->flows_;
+              MMDevice_Map_Iterator iterator (this->mmdevice_a_map_);
+              MMDevice_Map::ENTRY *entry = 0;
+              for (;iterator.next (entry) !=  0;iterator.advance ())
+                {
+                  flowspec = entry->int_id_.flowspec_;
+                }
+            }
+          else
+            {
+              flowspec = the_spec;
+            }
+
+          if (TAO_debug_level > 0)
+            ACE_DEBUG ((LM_DEBUG,
+                        "TAO_StreamCtrl::modify_QoS\n"));
+
+
+          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 ());
+                }
+            }
+
+          if (in_flowspec.length () != 0)
+            {
+              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 TAO_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+            }
+        }
       ACE_CATCHANY
-	{
-	  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::modify_QoS");
-	  return 0;
-	}
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION, "TAO_StreamCtrl::modify_QoS");
+          return 0;
+        }
       ACE_ENDTRY;
       ACE_CHECK_RETURN (0);
 
@@ -1480,8 +1483,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))
@@ -1492,7 +1495,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;
@@ -1510,8 +1513,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;
@@ -1521,7 +1524,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;
         }
     }
@@ -1536,8 +1539,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;
@@ -1546,8 +1549,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))
 {
@@ -1560,7 +1563,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;
             }
         }
@@ -1577,8 +1580,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))
@@ -1593,7 +1596,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;
             }
         }
@@ -1646,22 +1649,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;
 }
@@ -1682,8 +1685,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;
 }
@@ -1720,7 +1723,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
@@ -1730,7 +1733,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"));
 }
 
 // ----------------------------------------------------------------------
@@ -1754,8 +1757,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,
@@ -1769,8 +1772,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");
 
@@ -1780,8 +1783,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)
@@ -1802,7 +1805,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;
@@ -1832,18 +1835,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);
         }
 
 
@@ -1851,8 +1854,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++)
@@ -1881,14 +1884,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)
@@ -1904,13 +1907,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);
         }
@@ -1921,8 +1924,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);
@@ -1955,13 +1958,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)
@@ -2003,14 +2006,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)
@@ -2094,8 +2097,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))
 {
@@ -2172,7 +2175,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);
   //
 }
 
@@ -2182,8 +2185,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,
@@ -2193,8 +2196,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
@@ -2202,18 +2205,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: "
@@ -2229,19 +2232,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);
         }
@@ -2255,13 +2258,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;
@@ -2271,12 +2274,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++)
@@ -2286,21 +2289,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;
 }
@@ -2308,22 +2311,22 @@ 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)
   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"));
 
-  int result =  this->change_qos (new_qos, the_flows, ACE_TRY_ENV);
+  int result =  this->change_qos (new_qos, the_flows TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (0);
-  
+
   if (result != 0)
     return 0;
-  
+
   return 1;
 
 }
@@ -2331,8 +2334,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
@@ -2341,8 +2344,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;
     }
@@ -2358,14 +2361,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.
@@ -2373,8 +2375,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))
@@ -2387,8 +2389,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))
@@ -2401,8 +2403,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))
@@ -2423,8 +2425,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
@@ -2438,8 +2440,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))
@@ -2448,7 +2450,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;
@@ -2458,7 +2460,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;
@@ -2466,23 +2468,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.
@@ -2499,8 +2501,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
@@ -2514,8 +2516,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))
@@ -2537,8 +2539,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
@@ -2551,8 +2553,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
@@ -2560,8 +2562,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);
     }
@@ -2577,8 +2579,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
@@ -2589,8 +2591,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
@@ -2603,8 +2605,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;
@@ -2612,8 +2614,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"));
@@ -2663,8 +2665,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,
@@ -2701,7 +2703,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 ()))
@@ -2712,8 +2714,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;
@@ -2721,11 +2723,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
@@ -2738,11 +2740,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;
@@ -2751,13 +2753,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);
@@ -2856,8 +2858,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,
@@ -2870,8 +2872,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,
@@ -2899,8 +2901,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,
@@ -2926,7 +2928,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
@@ -2946,19 +2948,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
@@ -2969,8 +2971,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);
@@ -3051,8 +3053,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,
@@ -3067,8 +3069,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;
 
@@ -3079,8 +3081,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;
 
@@ -3089,8 +3091,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;
@@ -3099,10 +3101,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
@@ -3116,12 +3118,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)
 
 {
 //  ACE_UNUSED_ARG (media_ctrl);
-  ACE_UNUSED_ARG (ACE_TRY_ENV);
   ACE_CHECK_RETURN (0);
 
   // FIX MEMORY LEAK:
@@ -3138,8 +3139,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,
@@ -3151,8 +3152,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))
@@ -3162,8 +3163,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))
 {
@@ -3176,8 +3177,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
@@ -3193,8 +3194,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))
@@ -3208,8 +3209,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
@@ -3225,15 +3226,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)
     {
@@ -3241,35 +3242,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;
 }
@@ -3303,8 +3304,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,
@@ -3317,15 +3318,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
@@ -3343,8 +3344,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,
@@ -3354,7 +3355,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;
@@ -3367,8 +3367,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 ());
@@ -3380,8 +3380,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"),
@@ -3392,8 +3392,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"),
@@ -3422,12 +3422,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);
                     }
                 }
@@ -3464,8 +3464,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:
@@ -3474,8 +3474,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;
                       }
@@ -3495,8 +3495,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:
@@ -3508,8 +3508,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;
                       }
@@ -3521,10 +3521,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;
             }
         }
@@ -3545,8 +3545,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,
@@ -3555,7 +3555,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;
@@ -3566,9 +3566,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
@@ -3588,8 +3588,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,
@@ -3607,9 +3607,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
@@ -3626,8 +3626,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))
 {
@@ -3640,8 +3640,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))
@@ -3659,7 +3659,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
@@ -3673,8 +3673,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))
@@ -3684,14 +3684,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;
@@ -3701,7 +3701,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;
@@ -3725,8 +3725,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
@@ -3741,13 +3741,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);
@@ -3759,8 +3758,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,
@@ -3786,8 +3785,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
@@ -3843,7 +3842,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
@@ -3854,7 +3853,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
@@ -3863,7 +3862,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;
         }
     }
@@ -3878,7 +3877,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
@@ -3889,7 +3888,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
@@ -3898,7 +3897,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;
         }
     }
@@ -3913,7 +3912,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
@@ -3924,7 +3923,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
@@ -3933,7 +3932,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;
         }
     }
@@ -3951,13 +3950,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;
 }
@@ -3965,8 +3963,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))
@@ -3980,7 +3978,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
@@ -3990,26 +3988,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,
@@ -4018,7 +4015,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 *)"");
@@ -4026,20 +4023,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
@@ -4056,8 +4053,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,
@@ -4074,27 +4071,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)
@@ -4103,13 +4100,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.
@@ -4119,8 +4116,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;
         }
     }
@@ -4135,18 +4132,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))
@@ -4164,8 +4160,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);
             }
@@ -4199,8 +4195,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)
@@ -4223,15 +4219,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
@@ -4246,8 +4242,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))
 {
@@ -4259,8 +4255,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);
         }
@@ -4284,22 +4280,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
@@ -4311,15 +4307,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;
         }
@@ -4332,8 +4328,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
@@ -4347,13 +4343,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;
 }
@@ -4377,7 +4372,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*/)
 {
 }
 
@@ -4390,17 +4385,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 ());
@@ -4413,8 +4408,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
@@ -4438,11 +4433,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_)
@@ -4453,10 +4447,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;
@@ -4464,7 +4457,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);
@@ -4477,7 +4470,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))
 {
 
@@ -4485,26 +4478,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);
@@ -4512,7 +4504,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))
@@ -4522,8 +4514,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))
@@ -4534,8 +4526,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
@@ -4549,8 +4541,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))
 {
@@ -4562,8 +4554,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
@@ -4575,8 +4567,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))
@@ -4587,8 +4579,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
@@ -4600,8 +4592,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))
 {
@@ -4617,12 +4609,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"));
@@ -4642,8 +4634,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))
@@ -4658,8 +4650,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;
@@ -4667,8 +4659,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);
@@ -4683,16 +4675,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;
@@ -4737,8 +4729,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))
@@ -4751,8 +4743,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))
 {
@@ -4765,8 +4757,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,
@@ -4787,14 +4779,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;
@@ -4858,8 +4850,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,
@@ -4922,8 +4914,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;
@@ -4931,7 +4923,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 ();
@@ -4944,7 +4936,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 ();
@@ -4967,8 +4959,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,
@@ -4978,15 +4970,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,
@@ -4995,16 +4987,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,
@@ -5047,8 +5039,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
@@ -5056,8 +5048,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
@@ -5070,8 +5062,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;
@@ -5096,7 +5088,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 ();
@@ -5106,7 +5098,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 ();
@@ -5121,8 +5113,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,
@@ -5132,15 +5124,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,
@@ -5149,8 +5141,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 7d7a1e21c25..ec9354ae1d0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.cpp
@@ -148,8 +148,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);
@@ -168,7 +168,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;
@@ -184,17 +184,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:
           {
@@ -216,9 +216,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);
         }
@@ -238,8 +238,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)
@@ -251,16 +251,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*/
 
                       }
@@ -274,9 +274,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 ();
                 }
             }
         }
@@ -285,8 +285,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,
@@ -507,11 +507,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;
     }
@@ -636,74 +636,74 @@ 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);
     }
   else udp_factory->ref_count = 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);
     }
   else tcp_factory->ref_count = 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);
     }
   else udp_qos_factory->ref_count = 1;
 
-  ACE_NEW_RETURN (udp_qos_item, 
+  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*/
 
@@ -719,9 +719,9 @@ 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
@@ -729,11 +729,11 @@ TAO_AV_Core::init_transport_factories (void)
       for (; factory != end; factory++)
 	{
 	  const ACE_CString &name = (*factory)->name ();
-	  if (TAO_debug_level > 0) 
+	  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)
@@ -753,9 +753,8 @@ TAO_AV_Core::init_transport_factories (void)
 			  name.c_str ()));
 	    }
 	}
-      
     }
-  
+
   return 0;
 }
 
@@ -776,14 +775,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);
     }
   else udp_flow_factory->ref_count = 1;
 
@@ -803,14 +802,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);
     }
   else udp_qos_flow_factory->ref_count = 1;
 
@@ -829,14 +828,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);
     }
   else tcp_flow_factory->ref_count = 1;
 
@@ -853,14 +852,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);
     }
   else rtp_flow_factory->ref_count = 1;
 
@@ -877,14 +876,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);
     }
   else rtcp_flow_factory->ref_count = 1;
 
@@ -901,14 +900,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);
     }
   else sfp_flow_factory->ref_count = 1;
 
@@ -925,11 +924,11 @@ 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 ();
     }
@@ -938,7 +937,7 @@ TAO_AV_Core::init_flow_protocol_factories (void)
       for (; factory != end; factory++)
 	{
 	  const ACE_CString &name = (*factory)->name ();
-	  if (TAO_debug_level > 0) 
+	  if (TAO_debug_level > 0)
 	    ACE_DEBUG ((LM_DEBUG,
 			"%s \n",
 			name.c_str ()));
@@ -953,7 +952,7 @@ TAO_AV_Core::init_flow_protocol_factories (void)
 				 name.c_str (), ""),
 				-1);
 	    }
-	  
+
 	  (*factory)->factory ()->ref_count = 1;
 
 	  if (TAO_debug_level > 0)
@@ -963,7 +962,6 @@ TAO_AV_Core::init_flow_protocol_factories (void)
 			  name.c_str ()));
 	    }
 	}
-
     }
 
   return 0;
@@ -977,18 +975,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 04fe9fb7c88..67b44fd1fd1 100644
--- a/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
+++ b/TAO/orbsvcs/orbsvcs/AV/AV_Core.h
@@ -1,4 +1,4 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
 
 //=============================================================================
 /**
@@ -85,8 +85,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/FlowSpec_Entry.cpp b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
index b3ba91ba109..1fa9ad94fda 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.cpp
@@ -129,7 +129,7 @@ TAO_FlowSpec_Entry::set_protocol (void)
       else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"UDP") == 0)
           this->protocol_ = TAO_AV_Core::TAO_AV_UDP;
       else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"QoS_UDP") == 0)
-	this->protocol_ = TAO_AV_Core::TAO_AV_QOS_UDP;
+        this->protocol_ = TAO_AV_Core::TAO_AV_QOS_UDP;
       else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"AAL5") == 0)
         this->protocol_ = TAO_AV_Core::TAO_AV_AAL5;
       else if (ACE_OS::strcasecmp (this->carrier_protocol_.c_str(),"AAL3_4") == 0)
diff --git a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
index d5c25a71e12..631e07e676b 100644
--- a/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
+++ b/TAO/orbsvcs/orbsvcs/AV/FlowSpec_Entry.i
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
 
 // FlowSpec_Entry.i
@@ -26,11 +27,11 @@ TAO_FlowSpec_Entry::parse_flow_protocol_string (const char *flow_string)
 {
   if (flow_string == 0)
     return 0;
-  
+
   this->use_flow_protocol_ = 1;
   // do some flow protocol processing.
   this->flow_protocol_ = flow_string;
-  
+
   return 0;
 }
 
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/AV/RTCP_Channel.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
index 25c31cefe81..c95ca98493c 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Channel.h
@@ -218,5 +218,3 @@ private:
 
 #include "ace/post.h"
 #endif /* RTCP_CHANNEL_INCLUDE */
-
-
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
index 18a3d9c6152..3f9331f0375 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
+++ b/TAO/orbsvcs/orbsvcs/AV/RTCP_Packet.h
@@ -1,4 +1,5 @@
 // $Id$
+
 #ifndef RTCP_PACKET_INCLUDE
 #define RTCP_PACKET_INCLUDE
 
@@ -394,4 +395,3 @@ private:
 
 #include "ace/post.h"
 #endif  /*  RTCP_PACKET_INCLUDE  */
-
diff --git a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
index d1583f80aa0..18123f7afc0 100644
--- a/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/RTP.cpp
@@ -92,15 +92,15 @@ RTP_Packet::RTP_Packet(unsigned char padding,
                        ACE_UINT32 ssrc,
                        unsigned char csrc_count,
                        ACE_UINT32 *csrc_list,
-        	       char *data,
-        	       ACE_UINT16 data_size)
+                       char *data,
+                       ACE_UINT16 data_size)
   :extension_bytes_(0)
 {
   //size of header (in octets) without contributing sources
   ACE_UINT16 size = 3*4;
   int index = 0;
 
-  if (data_size > RTP_MTU-12) 
+  if (data_size > RTP_MTU-12)
   {
     data_size = RTP_MTU-12;
     ACE_DEBUG ((LM_DEBUG, "\n(%N,%l) RTP_Packet: Warning - packet truncated\n"));
@@ -747,5 +747,3 @@ ACE_STATIC_SVC_DEFINE (TAO_AV_RTP_Flow_Factory,
                        ACE_Service_Type::DELETE_THIS |
                        ACE_Service_Type::DELETE_OBJ,
                        0)
-
-
diff --git a/TAO/orbsvcs/orbsvcs/AV/Transport.h b/TAO/orbsvcs/orbsvcs/AV/Transport.h
index cca71e377a2..aff5ac38337 100644
--- a/TAO/orbsvcs/orbsvcs/AV/Transport.h
+++ b/TAO/orbsvcs/orbsvcs/AV/Transport.h
@@ -69,7 +69,7 @@ class TAO_AV_Flow_Protocol_Factory;
 
 /**
  * @class TAO_AV_Flow_Protocol_Item
- * @brief 
+ * @brief
  */
 class TAO_AV_Export TAO_AV_Flow_Protocol_Item
 {
diff --git a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
index 5e4e869921f..594a3da8001 100644
--- a/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/AV/UDP.cpp
@@ -91,7 +91,7 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos)
 
       if( ACE_OS::strcmp( qos.QoSParams[i].property_name.in(), "Diffserv_Codepoint") == 0)
         {
-          qos.QoSParams[i].property_value >>= dscp; 
+          qos.QoSParams[i].property_value >>= dscp;
           dscp_flag=1;
           // DSCP value can only be 6 bits wide
           if(!((dscp >= 0) && (dscp <= 63)))
@@ -109,9 +109,9 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos)
           // IP Diffserv byte
           if(!((ecn >= 0) && (ecn <= 3)))
             {
-              ACE_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn)); 
+              ACE_DEBUG((LM_DEBUG, "(%N,%l) ECN value can only be (0-3) not %d\n", ecn));
               ecn = 0;
-            }	
+            }
 
         }
     }
@@ -139,8 +139,8 @@ TAO_AV_UDP_Flow_Handler::change_qos(AVStreams::QoS qos)
            if(ret < 0 )
              {
                 ACE_DEBUG((LM_DEBUG, "(%N,%l) errno: %p\n"));
-	     }
-	}
+             }
+        }
       return ret;
 }
 
@@ -430,7 +430,7 @@ TAO_AV_UDP_Acceptor::open_i (ACE_INET_Addr *inet_addr,
                                                        this->entry_->is_multicast (),
                                                        TAO_AV_UDP_Connection_Setup::ACCEPTOR);
 
-	  if( result < 0)
+	  if (result < 0)
           {
              ACE_DEBUG((LM_DEBUG,"(%N,%l) Error during connection setup: %d\n", result));
           }
diff --git a/TAO/orbsvcs/orbsvcs/AV/md5.h b/TAO/orbsvcs/orbsvcs/AV/md5.h
index 034874fb852..4bcb01b04b4 100644
--- a/TAO/orbsvcs/orbsvcs/AV/md5.h
+++ b/TAO/orbsvcs/orbsvcs/AV/md5.h
@@ -1,4 +1,5 @@
 /* $Id$ */
+
 /* MD5.H - header file for MD5C.C
  */
 
@@ -46,4 +47,3 @@ void MD5Final (unsigned char digest[16], MD5_CTX *context);
 #ifdef __cplusplus
 }
 #endif
-
diff --git a/TAO/orbsvcs/orbsvcs/AV/md5c.c b/TAO/orbsvcs/orbsvcs/AV/md5c.c
index 1b9158987b6..ad1865f947e 100644
--- a/TAO/orbsvcs/orbsvcs/AV/md5c.c
+++ b/TAO/orbsvcs/orbsvcs/AV/md5c.c
@@ -324,4 +324,3 @@ static void MD5_memset (POINTER output, int value, unsigned int len)
   for (i = 0; i < len; i++)
  ((char *)output)[i] = (char)value;
 }
-
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.cpp b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
index 0557f9ea7d0..e8613a8b31f 100644
--- a/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
+++ b/TAO/orbsvcs/orbsvcs/CosEvent/CEC_EventChannel.cpp
@@ -74,7 +74,7 @@ TAO_CEC_EventChannel::~TAO_CEC_EventChannel (void)
 }
 
 void
-TAO_CEC_EventChannel::activate (CORBA::Environment&)
+TAO_CEC_EventChannel::activate (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   this->dispatching_->activate ();
   this->pulling_strategy_->activate ();
@@ -83,7 +83,7 @@ TAO_CEC_EventChannel::activate (CORBA::Environment&)
 }
 
 void
-TAO_CEC_EventChannel::shutdown (CORBA::Environment& ACE_TRY_ENV)
+TAO_CEC_EventChannel::shutdown (TAO_ENV_SINGLE_ARG_DECL)
 {
   this->dispatching_->shutdown ();
   this->pulling_strategy_->shutdown ();
@@ -91,87 +91,87 @@ TAO_CEC_EventChannel::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);
 
-  this->consumer_admin_->shutdown (ACE_TRY_ENV);
+  this->consumer_admin_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushConsumer* consumer
+                                 TAO_ENV_ARG_DECL)
 {
-  this->supplier_admin_->connected (consumer, ACE_TRY_ENV);
+  this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushConsumer* consumer
+                                   TAO_ENV_ARG_DECL)
 {
-  this->supplier_admin_->reconnected (consumer, ACE_TRY_ENV);
+  this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPushConsumer* consumer
+                                    TAO_ENV_ARG_DECL)
 {
-  this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV);
+  this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPullConsumer* consumer
+                                 TAO_ENV_ARG_DECL)
 {
-  this->supplier_admin_->connected (consumer, ACE_TRY_ENV);
+  this->supplier_admin_->connected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPullConsumer* consumer
+                                   TAO_ENV_ARG_DECL)
 {
-  this->supplier_admin_->reconnected (consumer, ACE_TRY_ENV);
+  this->supplier_admin_->reconnected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer,
-                                    CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_EventChannel::disconnected (TAO_CEC_ProxyPullConsumer* consumer
+                                    TAO_ENV_ARG_DECL)
 {
-  this->supplier_admin_->disconnected (consumer, ACE_TRY_ENV);
+  this->supplier_admin_->disconnected (consumer TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier,
-                                 CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_EventChannel::connected (TAO_CEC_ProxyPushSupplier* supplier
+                                 TAO_ENV_ARG_DECL)
 {
-  this->consumer_admin_->connected (supplier, ACE_TRY_ENV);
+  this->consumer_admin_->connected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 void
-TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier,
-                                   CORBA::Environment &ACE_TRY_ENV)
+TAO_CEC_EventChannel::reconnected (TAO_CEC_ProxyPushSupplier* supplier
+                                   TAO_ENV_ARG_DECL)
 {
   this->consumer_admin_->reconnected (supplier TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
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/CosLifeCycle.idl b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
index f71e9cd2610..f3c1fb266b7 100644
--- a/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
+++ b/TAO/orbsvcs/orbsvcs/CosLifeCycle.idl
@@ -124,3 +124,4 @@ typedef sequence <NameValuePair> Criteria;
 */
 
 #endif /* TAO_LIFECYCLE_IDL */
+
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_Delayed_Command.cpp b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
index 8f2a176d4ab..f481d4f1bac 100644
--- a/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
+++ b/TAO/orbsvcs/orbsvcs/ESF/ESF_Delayed_Command.cpp
@@ -16,11 +16,20 @@ ACE_RCSID(ESF, ESF_Delayed_Command, "$Id$")
 template<class Target, class Object> int
 TAO_ESF_Connected_Command<Target,Object>::execute (void* arg)
 {
-  CORBA::Environment *env = &TAO_default_environment ();
   if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
+    {
+      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+                            *ACE_static_cast(CORBA::Environment*, arg));
+      this->target_->connected_i (this->object_
+                                  TAO_ENV_ARG_PARAMETER);
+    }
+  else
+    {
+      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      this->target_->connected_i (this->object_
+                                  TAO_ENV_ARG_PARAMETER);
+    }
 
-  this->target_->connected_i (this->object_, *env);
   return 0;
 }
 
@@ -33,7 +42,19 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg)
   if (arg != 0)
     env = ACE_static_cast(CORBA::Environment*, arg);
 
-  this->target_->reconnected_i (this->object_, *env);
+  if (arg != 0)
+    {
+      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+                             *ACE_static_cast(CORBA::Environment*, arg));
+      this->target_->reconnected_i (this->object_
+                                    TAO_ENV_ARG_PARAMETER);
+    }
+  else
+    {
+      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      this->target_->reconnected_i (this->object_
+                                    TAO_ENV_ARG_PARAMETER);
+    }
   return 0;
 }
 
@@ -42,11 +63,19 @@ TAO_ESF_Reconnected_Command<Target,Object>::execute (void* arg)
 template<class Target, class Object> int
 TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg)
 {
-  CORBA::Environment *env = &TAO_default_environment ();
   if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
-
-  this->target_->disconnected_i (this->object_, *env);
+    {
+      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+                             *ACE_static_cast(CORBA::Environment*, arg));
+      this->target_->disconnected_i (this->object_
+                                     TAO_ENV_ARG_PARAMETER);
+    }
+  else
+    {
+      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      this->target_->disconnected_i (this->object_
+                                     TAO_ENV_ARG_PARAMETER);
+    }
   return 0;
 }
 
@@ -55,11 +84,17 @@ TAO_ESF_Disconnected_Command<Target,Object>::execute (void* arg)
 template<class Target> int
 TAO_ESF_Shutdown_Command<Target>::execute (void* arg)
 {
-  CORBA::Environment *env = &TAO_default_environment ();
   if (arg != 0)
-    env = ACE_static_cast(CORBA::Environment*, arg);
-
-  this->target_->shutdown_i (*env);
+    {
+      TAO_ENV_EMIT_CODE (CORBA::Environment &ACE_TRY_ENV =
+                             *ACE_static_cast(CORBA::Environment*, arg));
+      this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+    }
+  else
+    {
+      TAO_ENV_EMIT_CODE (TAO_ENV_DECLARE_NEW_ENV);
+      this->target_->shutdown_i (TAO_ENV_SINGLE_ARG_PARAMETER);
+    }
   return 0;
 }
 
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 31dc9458716..62f0d7a8402 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/Dispatching_Modules.cpp
@@ -13,7 +13,9 @@
 
 #include "tao/Timeprobe.h"
 
-ACE_RCSID(Event, Dispatching_Modules, "$Id$")
+ACE_RCSID (Event,
+           Dispatching_Modules,
+           "$Id$")
 
 #if defined (ACE_ENABLE_TIMEPROBES)
 
@@ -150,11 +152,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 +240,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 +255,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 +337,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 +354,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;
@@ -617,7 +619,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
@@ -631,8 +633,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,
@@ -643,8 +645,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;
           }
@@ -683,8 +685,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.
@@ -725,11 +727,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
@@ -756,11 +758,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/ECG_Mcast_EH.cpp b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
index 8efc4b7a5d7..ac198817c3c 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.cpp
@@ -26,8 +26,8 @@ TAO_ECG_Mcast_EH::~TAO_ECG_Mcast_EH (void)
 // @@ TODO Why have a return code *and* exceptions?  Only one would do!
 
 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)
 {
   // @@ TODO Think about the exception safety (or lack thereof) of
   // this code, what if the following operations fail?
@@ -42,13 +42,13 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec,
   // its lifetime.
 
   RtecEventChannelAdmin::Observer_var obs =
-    this->observer_._this (ACE_TRY_ENV);
+    this->observer_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_TRY
     {
       this->handle_ =
-        this->ec_->append_observer (obs.in (), ACE_TRY_ENV);
+        this->ec_->append_observer (obs.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
   ACE_CATCH(CORBA::SystemException, ex)
@@ -58,12 +58,12 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec,
       // we should encapsulate it in a Deactivator.
 
       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);
 
       ACE_RE_THROW;
@@ -75,26 +75,26 @@ TAO_ECG_Mcast_EH::open (RtecEventChannelAdmin::EventChannel_ptr ec,
 }
 
 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);
 
   // @@ TODO If the first operation raises an exception then the
   // second one never executes!!!
   {
     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);
   }
 
@@ -141,8 +141,8 @@ TAO_ECG_Mcast_EH::handle_input (ACE_HANDLE fd)
 void
 TAO_ECG_Mcast_EH::compute_required_subscriptions (
     const RtecEventChannelAdmin::ConsumerQOS& sub,
-    Address_Set& multicast_addresses,
-    CORBA::Environment& ACE_TRY_ENV)
+    Address_Set& multicast_addresses
+    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   CORBA::ULong count = sub.dependencies.length ();
@@ -168,7 +168,7 @@ TAO_ECG_Mcast_EH::compute_required_subscriptions (
       //   opportunity to recover it.
       // + Close the MCast Event Handler completely, too much policy
       //   for this level.
-      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);
@@ -296,8 +296,8 @@ TAO_ECG_Mcast_EH::add_new_subscriptions (
 
 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))
 {
   // @@ TODO This function turned out to be too long, we need to break
@@ -308,7 +308,7 @@ TAO_ECG_Mcast_EH::update_consumer (
 
   Address_Set multicast_addresses;
 
-  this->compute_required_subscriptions (sub, multicast_addresses, ACE_TRY_ENV);
+  this->compute_required_subscriptions (sub, multicast_addresses TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // 2) To conserve OS and network resources we first unsubscribe from
@@ -326,8 +326,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
@@ -342,20 +342,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);
 }
 
 #if defined (ACE_HAS_EXPLICIT_TEMPLATE_INSTANTIATION)
diff --git a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
index 3bb1a708476..a4f52be104d 100644
--- a/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
+++ b/TAO/orbsvcs/orbsvcs/Event/ECG_Mcast_EH.h
@@ -58,25 +58,25 @@ 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);
 
   /// Reactor callbacks
   virtual int handle_input (ACE_HANDLE fd);
 
   /// 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));
 
   /**
@@ -99,14 +99,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:
@@ -135,8 +133,8 @@ private:
 
   void compute_required_subscriptions (
         const RtecEventChannelAdmin::ConsumerQOS& sub,
-              Address_Set& multicast_addresses,
-              CORBA::Environment &ACE_TRY_ENV)
+              Address_Set& multicast_addresses
+              TAO_ENV_ARG_DECL)
               ACE_THROW_SPEC ((CORBA::SystemException));
 
   /// Delete the list of multicast addresses that we need not
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_ConsumerAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
index 4e07e5f77ca..ddcfd4faa5f 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.cpp
@@ -26,14 +26,14 @@ TAO_EC_ConsumerAdmin::~TAO_EC_ConsumerAdmin (void)
 }
 
 RtecEventChannelAdmin::ProxyPushSupplier_ptr
-TAO_EC_ConsumerAdmin::obtain_push_supplier (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_ConsumerAdmin::obtain_push_supplier (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obtain (ACE_TRY_ENV);
+  return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_EC_ConsumerAdmin::_default_POA (CORBA::Environment&)
+TAO_EC_ConsumerAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
index 6fd0c393669..cac71634fde 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_ConsumerAdmin.h
@@ -60,11 +60,11 @@ public:
 
   // = The RtecEventChannelAdmin::ConsumerAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushSupplier_ptr
-      obtain_push_supplier (CORBA::Environment &)
+      obtain_push_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:
   /// Store the default POA.
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 71636f5eb64..e8e5dd84c30 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.cpp
@@ -9,7 +9,9 @@
 #include "EC_Gateway_UDP.i"
 #endif /* __ACE_INLINE__ */
 
-ACE_RCSID(Event, EC_Gateway_UDP, "$Id$")
+ACE_RCSID (Event,
+           EC_Gateway_UDP,
+           "$Id$")
 
 // ****************************************************************
 
@@ -29,8 +31,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 +54,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 +80,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 +133,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 +172,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 +237,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 +265,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 +286,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 +310,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 +335,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 +624,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 +661,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 +685,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 +700,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 +753,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 +939,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 +966,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
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
index 31fbd7762fa..8b01c24f5ad 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_Gateway_UDP.h
@@ -1,4 +1,5 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 /**
  *  @file   EC_Gateway_UDP.h
  *
@@ -135,8 +136,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 +150,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 +183,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 +348,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 +446,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 +472,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.
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_SupplierAdmin.cpp b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
index 56a2367174b..b58780478d0 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.cpp
@@ -26,14 +26,14 @@ TAO_EC_SupplierAdmin::~TAO_EC_SupplierAdmin (void)
 }
 
 RtecEventChannelAdmin::ProxyPushConsumer_ptr
-TAO_EC_SupplierAdmin::obtain_push_consumer (CORBA::Environment &ACE_TRY_ENV)
+TAO_EC_SupplierAdmin::obtain_push_consumer (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return this->obtain (ACE_TRY_ENV);
+  return this->obtain (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 PortableServer::POA_ptr
-TAO_EC_SupplierAdmin::_default_POA (CORBA::Environment&)
+TAO_EC_SupplierAdmin::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->default_POA_.in ());
 }
diff --git a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
index 5276ac001f3..73e32e18315 100644
--- a/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
+++ b/TAO/orbsvcs/orbsvcs/Event/EC_SupplierAdmin.h
@@ -50,11 +50,11 @@ public:
 
   // = The RtecEventChannelAdmin::SupplierAdmin methods...
   virtual RtecEventChannelAdmin::ProxyPushConsumer_ptr
-      obtain_push_consumer (CORBA::Environment &)
+      obtain_push_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:
   /// Store the default POA.
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/Event_Channel.i b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
index bc78c9981b5..395b70bc70b 100644
--- a/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
+++ b/TAO/orbsvcs/orbsvcs/Event/Event_Channel.i
@@ -69,37 +69,37 @@ ACE_Push_Consumer_Proxy::correlation (void)
 }
 
 ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
-ACE_ES_Consumer_Module::get_ref (CORBA::Environment &env)
+ACE_ES_Consumer_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 {
-  return this->_this (env);
+  return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
-ACE_ES_Supplier_Module::get_ref (CORBA::Environment &env)
+ACE_ES_Supplier_Module::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 {
-  return this->_this (env);
+  return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // **************************************************
 
 ACE_INLINE RtecEventChannelAdmin::EventChannel_ptr
-ACE_EventChannel::get_ref (CORBA::Environment &env)
+ACE_EventChannel::get_ref (TAO_ENV_SINGLE_ARG_DECL)
 {
-  return this->_this (env);
+  return this->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE RtecEventChannelAdmin::SupplierAdmin_ptr
-ACE_EventChannel::for_suppliers (CORBA::Environment &env)
+ACE_EventChannel::for_suppliers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return supplier_module_->get_ref (env);
+  return supplier_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE RtecEventChannelAdmin::ConsumerAdmin_ptr
-ACE_EventChannel::for_consumers (CORBA::Environment &env)
+ACE_EventChannel::for_consumers (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return consumer_module_->get_ref (env);
+  return consumer_module_->get_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 ACE_INLINE TAO_EC_Timer_Module*
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/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp
index 9c0c198c5d0..4da47b060d7 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.cpp
@@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void)
 }
 
 CORBA::Object_ptr
-TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
diff --git a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h
index 523ff488d9e..93887fc6ac0 100644
--- a/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/LoadBalancing/Round_Robin_Strategy.h
@@ -60,7 +60,7 @@ public:
   // Destructor
 
   // = The Load_Balancing_Strategy methods
-  virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV)
+  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual int insert (TAO_LB_ReplicaProxy *);
   virtual int remove (TAO_LB_ReplicaProxy *);
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/BasicLog_i.h b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
index aca57dc79ed..483db1f88c6 100644
--- a/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
+++ b/TAO/orbsvcs/orbsvcs/Log/BasicLog_i.h
@@ -65,7 +65,7 @@ public:
   // Destructor.
 
   void
-  destroy (CORBA::Environment &ACE_TRY_ENV)
+  destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Destroy the log object and all contained records.
 
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 a673ba3c6b2..5b9065fa68d 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Context_Interface.cpp
@@ -1,4 +1,5 @@
 // $Id$
+
 // ============================================================================
 //
 // = LIBRARY
@@ -25,118 +26,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 +172,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 +288,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))
 {
@@ -406,8 +407,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);
 
@@ -437,16 +438,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);
 
 
@@ -500,8 +501,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,
@@ -512,11 +513,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 6955036110f..059b9c7587c 100644
--- a/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
+++ b/TAO/orbsvcs/orbsvcs/Naming/Naming_Utils.cpp
@@ -14,7 +14,9 @@
 #include "ace/Auto_Ptr.h"
 #include "ace/Get_Opt.h"
 
-ACE_RCSID(Naming, Naming_Utils, "$Id$")
+ACE_RCSID (Naming,
+           Naming_Utils,
+           "$Id$")
 
 TAO_Naming_Server::TAO_Naming_Server (void)
   : naming_context_ (),
@@ -75,14 +77,14 @@ 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
         {
           // Try to find an existing Naming Service.
           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 ()))
@@ -95,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;
@@ -200,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
@@ -208,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 ()))
@@ -219,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);
@@ -236,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;
@@ -262,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;
         }
 
@@ -326,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)
@@ -361,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 ()))
         {
@@ -387,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;
         }
 
@@ -490,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 ()))
         {
@@ -508,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;
         }
     }
@@ -562,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 ()))
@@ -574,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_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h
index 64bd4e8e80b..54fa37c4495 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Collection_Factory.h
@@ -40,10 +40,10 @@ class TAO_Notify_Export TAO_Notify_Collection_Factory : public ACE_Service_Objec
   //
 public:
   // = Methods to create listener collections.
-  virtual TAO_Notify_EventListener_List* create_event_listener_list (CORBA::Environment &ACE_TRY_ENV) = 0;
+  virtual TAO_Notify_EventListener_List* create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL) = 0;
   // Create the event listener list.
 
- virtual TAO_Notify_UpdateListener_List* create_update_listener_list (CORBA::Environment &ACE_TRY_ENV) = 0;
+ virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL) = 0;
   // create update listener list.
 };
 
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h
index d14b4ea5a66..127a0966189 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Command.h
@@ -46,7 +46,7 @@ class TAO_Notify_Export TAO_Notify_Command : public ACE_Message_Block
   TAO_Notify_Command (TAO_Notify_Event_Processor* event_processor, TAO_Notify_Event* event);
   ~TAO_Notify_Command ();
 
-  virtual int execute (CORBA::Environment& ACE_TRY_ENV) = 0;
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL) = 0;
   // Command callback
 
 protected:
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..0e406596476 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ConsumerAdmin_i.cpp
@@ -54,8 +54,6 @@ 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;
-
    delete this->lock_;
 
    delete this->event_listener_list_;
@@ -89,32 +87,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 +125,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 +138,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 +159,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 +185,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 +218,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 +231,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 +290,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 +311,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 +335,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 +367,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 +385,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 +402,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 +489,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 +514,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 +608,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 +633,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 +644,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 +654,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 +663,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 +673,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 +682,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 +700,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 +719,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_Collection_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
index 5c3eb07c344..da83f014891 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.cpp
@@ -39,7 +39,7 @@ TAO_Notify_Default_Collection_Factory::fini (void)
 }
 
 TAO_Notify_EventListener_List*
-TAO_Notify_Default_Collection_Factory::create_event_listener_list (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_Default_Collection_Factory::create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
   // @@ Pradeep: the copy_on_write versions are a much better choice
   // for a default than the immediate changes version.  The latter
@@ -68,7 +68,7 @@ ACE_NEW_THROW_EX (listener_list,
 }
 
 TAO_Notify_UpdateListener_List*
-TAO_Notify_Default_Collection_Factory::create_update_listener_list (CORBA::Environment &/*ACE_TRY_ENV*/)
+TAO_Notify_Default_Collection_Factory::create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*TAO_ENV_SINGLE_ARG_PARAMETER*/)
 {
 
   /*  TAO_Notify_UpdateListener_List* listener_list =
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
index 1baa1622268..78c621a790d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Default_Collection_Factory.h
@@ -51,10 +51,10 @@ public:
   virtual int fini (void);
 
   // = Methods to create listener collections.
-  virtual TAO_Notify_EventListener_List* create_event_listener_list (CORBA::Environment &ACE_TRY_ENV);
+  virtual TAO_Notify_EventListener_List* create_event_listener_list (TAO_ENV_SINGLE_ARG_DECL);
   // Create the event listener list.
 
- virtual TAO_Notify_UpdateListener_List* create_update_listener_list (CORBA::Environment &ACE_TRY_ENV);
+ virtual TAO_Notify_UpdateListener_List* create_update_listener_list (TAO_ENV_SINGLE_ARG_DECL);
   // create update listener list.
 };
 
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..708164dc121 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_ENV_BKWD_COMPAT)
+                                                 ,
+#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..243a60aa35d 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_ENV_BKWD_COMPAT)
+  ,    // 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_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h
index 342f6f3a066..b1646aabdcd 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Event_Dispatch_Command.h
@@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Event_Dispatch_Command : public TAO_Notify_Co
 
   ~TAO_Notify_Event_Dispatch_Command ();
 
-  virtual int execute (CORBA::Environment& ACE_TRY_ENV);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
   // Command callback
 
  protected:
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_Factory.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
index 575f62c7fec..7b9859e70f4 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.cpp
@@ -16,7 +16,7 @@ TAO_Notify_Collection_Factory* TAO_Notify_Factory::collection_factory_ = 0;
 TAO_Notify_EMO_Factory* TAO_Notify_Factory::emo_factory_ = 0;
 
 void
-TAO_Notify_Factory::init (CORBA::Environment &ACE_TRY_ENV)
+TAO_Notify_Factory::init (TAO_ENV_SINGLE_ARG_DECL)
 {
   co_factory_ =
     ACE_Dynamic_Service <TAO_Notify_CO_Factory>::instance (TAO_NOTIFY_DEF_CO_FACTORY_NAME);
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h
index bc430df663d..e5476598473 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Factory.h
@@ -62,7 +62,7 @@ class TAO_Notify_Export TAO_Notify_Factory
  protected:
   friend class TAO_Notify_EventChannelFactory_i;
 
-  static void init (CORBA::Environment &ACE_TRY_ENV);
+  static void init (TAO_ENV_SINGLE_ARG_DECL);
   // Initalize the services.
 
   static void shutdown (void);
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_ID_Pool_T.cpp b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp
index 988ce522565..3e917878450 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.cpp
@@ -51,7 +51,7 @@ TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::~TAO_Notify_ID_Pool_Ex ()
 }
 
 template <class ID_TYPE, class ID_TYPE_SEQ> ID_TYPE_SEQ*
-TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::get_sequence (CORBA::Environment & ACE_TRY_ENV)
+TAO_Notify_ID_Pool_Ex<ID_TYPE, ID_TYPE_SEQ>::get_sequence (TAO_ENV_SINGLE_ARG_DECL)
 {
   // Figure out the length of the list.
   size_t len = this->active_list_.size ();
diff --git a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
index 658ed8045fc..33471fc7b10 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_ID_Pool_T.h
@@ -78,7 +78,7 @@ class TAO_Notify_ID_Pool_Ex : public TAO_Notify_ID_Pool <ID_TYPE>
   TAO_Notify_ID_Pool_Ex (void);
   ~TAO_Notify_ID_Pool_Ex ();
 
-  ID_TYPE_SEQ* get_sequence (CORBA::Environment &ACE_TRY_ENV);
+  ID_TYPE_SEQ* get_sequence (TAO_ENV_SINGLE_ARG_DECL);
   // Get a list of all ids in use.
   // Essentially converts the <active_list_> to a Sequence.
 };
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_Listener_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h
index 394339bac7c..daaf4567e9b 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Listener_Filter_Eval_Command.h
@@ -45,7 +45,7 @@ class TAO_Notify_Export TAO_Notify_Listener_Filter_Eval_Command : public TAO_Not
 
   ~TAO_Notify_Listener_Filter_Eval_Command();
 
-  virtual int execute (CORBA::Environment& ACE_TRY_ENV);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
   // Command callback
 
  protected:
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_Source_Filter_Eval_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h
index 4ec6829e654..50fd2182489 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Source_Filter_Eval_Command.h
@@ -48,7 +48,7 @@ public:
   ~TAO_Notify_Source_Filter_Eval_Command ();
   // Destructor.
 
-  virtual int execute (CORBA::Environment& ACE_TRY_ENV);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
   // Command callback
 
 protected:
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..d3a54d94d95 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_SupplierAdmin_i.cpp
@@ -34,8 +34,6 @@ TAO_Notify_SupplierAdmin_i::~TAO_Notify_SupplierAdmin_i ()
     ACE_DEBUG ((LM_DEBUG,"in SA dtor\n"));
   // Cleanup all resources..
 
-  ACE_DECLARE_NEW_CORBA_ENV;
-
   delete this->lock_;
 
   this->event_channel_->supplier_admin_destroyed (this->my_id_);
@@ -51,8 +49,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 +60,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 +73,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 +102,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 +119,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 +137,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 +146,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 +158,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 +246,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 +273,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 +393,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 +408,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 +421,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 +432,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_Update_Dispatch_Command.h b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h
index c8ab14ad24f..e32a2c9ae3d 100644
--- a/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h
+++ b/TAO/orbsvcs/orbsvcs/Notify/Notify_Update_Dispatch_Command.h
@@ -46,7 +46,7 @@ class TAO_Notify_Export TAO_Notify_Update_Dispatch_Command : public TAO_Notify_C
 
   ~TAO_Notify_Update_Dispatch_Command ();
 
-  virtual int execute (CORBA::Environment& ACE_TRY_ENV);
+  virtual int execute (TAO_ENV_SINGLE_ARG_DECL);
   // Command callback
 
 protected:
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/Round_Robin_Strategy.cpp b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp
index 9c0c198c5d0..4da47b060d7 100644
--- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.cpp
@@ -39,7 +39,7 @@ TAO_LB_Round_Robin_Strategy::~TAO_LB_Round_Robin_Strategy (void)
 }
 
 CORBA::Object_ptr
-TAO_LB_Round_Robin_Strategy::replica (CORBA::Environment &ACE_TRY_ENV)
+TAO_LB_Round_Robin_Strategy::replica (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_GUARD_RETURN (TAO_SYNCH_MUTEX,
diff --git a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h
index 523ff488d9e..93887fc6ac0 100644
--- a/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h
+++ b/TAO/orbsvcs/orbsvcs/Round_Robin_Strategy.h
@@ -60,7 +60,7 @@ public:
   // Destructor
 
   // = The Load_Balancing_Strategy methods
-  virtual CORBA::Object_ptr replica (CORBA_Environment &ACE_TRY_ENV)
+  virtual CORBA::Object_ptr replica (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
   virtual int insert (TAO_LB_ReplicaProxy *);
   virtual int remove (TAO_LB_ReplicaProxy *);
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 e9bd1ace510..8957c05b9d7 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)
@@ -253,8 +253,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)
@@ -262,15 +262,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);
 }
 
 
@@ -293,7 +293,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
@@ -316,8 +316,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 ();
 
@@ -351,16 +351,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/EstablishTrustPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp
index d03376c5459..a0cec544909 100644
--- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.cpp
@@ -17,14 +17,14 @@ TAO_EstablishTrustPolicy::~TAO_EstablishTrustPolicy (void)
 }
 
 CORBA::PolicyType
-TAO_EstablishTrustPolicy::policy_type (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_EstablishTrustPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Security::SecEstablishTrustPolicy;
 }
 
 CORBA::Policy_ptr
-TAO_EstablishTrustPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_EstablishTrustPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_EstablishTrustPolicy *policy = 0;
@@ -41,13 +41,13 @@ TAO_EstablishTrustPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_EstablishTrustPolicy::destroy (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_EstablishTrustPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::EstablishTrust
-TAO_EstablishTrustPolicy::trust (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_EstablishTrustPolicy::trust (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->trust_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h
index ebedb814109..5fd059b6a07 100644
--- a/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/EstablishTrustPolicy.h
@@ -51,23 +51,20 @@ public:
    * @name CORBA::Policy Methods
    */
   //@{
-  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 "establish trust" value associated with this
   /// policy.
   virtual Security::EstablishTrust trust (
-      CORBA::Environment &ACE_TRY_ENV = TAO_default_environment ())
+      TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp
index 495ec1e5bc7..3b306b5aaf8 100644
--- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp
+++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.cpp
@@ -16,14 +16,14 @@ TAO_QOPPolicy::~TAO_QOPPolicy (void)
 }
 
 CORBA::PolicyType
-TAO_QOPPolicy::policy_type (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_QOPPolicy::policy_type (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return Security::SecQOPPolicy;
 }
 
 CORBA::Policy_ptr
-TAO_QOPPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
+TAO_QOPPolicy::copy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_QOPPolicy *policy = 0;
@@ -40,13 +40,13 @@ TAO_QOPPolicy::copy (CORBA::Environment &ACE_TRY_ENV)
 }
 
 void
-TAO_QOPPolicy::destroy (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_QOPPolicy::destroy (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 Security::QOP
-TAO_QOPPolicy::qop (CORBA::Environment & /* ACE_TRY_ENV */)
+TAO_QOPPolicy::qop (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return this->qop_;
diff --git a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h
index 1431ec768eb..0579628d355 100644
--- a/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h
+++ b/TAO/orbsvcs/orbsvcs/Security/QOPPolicy.h
@@ -51,23 +51,19 @@ public:
    * @name CORBA::Policy Methods
    */
   //@{
-  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 Quality-of-Protection value associated with this
   /// policy.
-  virtual Security::QOP qop (CORBA::Environment &ACE_TRY_ENV =
-                               TAO_default_environment ())
+  virtual Security::QOP qop (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 protected:
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/Time/Timer_Helper.cpp b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
index 80ef6babdeb..7b7dac9aa22 100644
--- a/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
+++ b/TAO/orbsvcs/orbsvcs/Time/Timer_Helper.cpp
@@ -52,7 +52,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
 
           // This is a remote call.
           CosTime::UTO_var UTO_server =
-            (*value)->universal_time (ACE_TRY_ENV);
+            (*value)->universal_time (TAO_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -83,7 +83,7 @@ Timer_Helper::handle_timeout (const ACE_Time_Value &,
                       (UTO_server->utc_time ()).tdf));
           #endif
 
-          CORBA::ULongLong curr_server_time = UTO_server->time (ACE_TRY_ENV);
+          CORBA::ULongLong curr_server_time = UTO_server->time (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           sum += curr_server_time;
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_Nodes.cpp b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
index e77d5d1671a..e7bc02db9c9 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
+++ b/TAO/orbsvcs/orbsvcs/Trader/Constraint_Nodes.cpp
@@ -294,7 +294,7 @@ TAO_Literal_Constraint (CORBA::Any* any)
   CORBA::TCKind corba_type = CORBA::tk_null;
   ACE_TRY
     {
-      corba_type = type->kind (ACE_TRY_ENV);
+      corba_type = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -487,7 +487,7 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
   CORBA::TCKind kind = CORBA::tk_null;
   ACE_TRY
     {
-      kind = type->kind (ACE_TRY_ENV);
+      kind = type->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -525,9 +525,9 @@ TAO_Literal_Constraint::comparable_type (CORBA::TypeCode_ptr type)
         CORBA::TCKind kind = CORBA::tk_void;
         ACE_TRY_EX (label2)
           {
-            CORBA::TypeCode_var typecode = type->content_type (ACE_TRY_ENV);
+            CORBA::TypeCode_var typecode = type->content_type (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK_EX (label2);
-            kind = typecode->kind (ACE_TRY_ENV);
+            kind = typecode->kind (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK_EX (label2);;
           }
         ACE_CATCHANY
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_T.h b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
index ea2a7672860..fd7aa7d1dd7 100644
--- a/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
+++ b/TAO/orbsvcs/orbsvcs/Trader/Trader_T.h
@@ -113,27 +113,27 @@ public:
   TAO_Trader_Components (const TAO_Trading_Components_i& comps);
 
   // = CosTrading::TraderComponents methods.
-  virtual CosTrading::Lookup_ptr lookup_if (CORBA::Environment &)
+  virtual CosTrading::Lookup_ptr lookup_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns an object reference to the Lookup interface of the trader.
   // Returns nil if the trader does not support Lookup interface.
 
-  virtual CosTrading::Register_ptr register_if (CORBA::Environment &)
+  virtual CosTrading::Register_ptr register_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Register interface of the trader.
   // Returns nil if the trader does not support Register interface.
 
-  virtual CosTrading::Link_ptr link_if (CORBA::Environment &)
+  virtual CosTrading::Link_ptr link_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Link interface of the trader.
   // Returns nil if the trader does not support Link interface.
 
-  virtual CosTrading::Proxy_ptr proxy_if (CORBA::Environment &)
+  virtual CosTrading::Proxy_ptr proxy_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference to the Proxy interface of the trader.
   // Returns nil if the trader does not support Proxy interface.
 
-  virtual CosTrading::Admin_ptr admin_if (CORBA::Environment &)
+  virtual CosTrading::Admin_ptr admin_if (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Returns object reference for the Admin interface of the trader.
   // Returns nil if the trader does not support Admin interface.
@@ -152,16 +152,16 @@ public:
 
   // = CosTrading::SupportAttributes methods.
 
-  virtual CORBA::Boolean supports_modifiable_properties (CORBA::Environment &)
+  virtual CORBA::Boolean supports_modifiable_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean supports_dynamic_properties (CORBA::Environment &)
+  virtual CORBA::Boolean supports_dynamic_properties (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Boolean supports_proxy_offers (CORBA::Environment &)
+  virtual CORBA::Boolean supports_proxy_offers (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosTrading::TypeRepository_ptr type_repos (CORBA::Environment &)
+  virtual CosTrading::TypeRepository_ptr type_repos (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
@@ -178,47 +178,47 @@ public:
 
   // = CosTrading::ImportAttributes methods.
 
-  virtual CORBA::ULong def_search_card (CORBA::Environment &)
+  virtual CORBA::ULong def_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_search_card (CORBA::Environment &)
+  virtual CORBA::ULong max_search_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Search cardinality determines the maximum number of offers searched
   // before not considering other offers.
 
-  virtual CORBA::ULong def_match_card (CORBA::Environment &)
+  virtual CORBA::ULong def_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_match_card (CORBA::Environment &)
+  virtual CORBA::ULong max_match_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Match cardinality determines the maximum number of offers
   // matched to the constraints before not considering other offers..
 
-  virtual CORBA::ULong def_return_card (CORBA::Environment &)
+  virtual CORBA::ULong def_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_return_card (CORBA::Environment &)
+  virtual CORBA::ULong max_return_card (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   // Return cardinality determines the maximum number of offers marked
   // to return before not considering other offers.
 
 
-  virtual CORBA::ULong max_list (CORBA::Environment &)
+  virtual CORBA::ULong max_list (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong def_hop_count (CORBA::Environment &)
+  virtual CORBA::ULong def_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::ULong max_hop_count (CORBA::Environment &)
+  virtual CORBA::ULong max_hop_count (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosTrading::FollowOption def_follow_policy (CORBA::Environment &)
+  virtual CosTrading::FollowOption def_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CosTrading::FollowOption max_follow_policy (CORBA::Environment &)
+  virtual CosTrading::FollowOption max_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 
@@ -235,7 +235,7 @@ public:
   TAO_Link_Attributes (const TAO_Link_Attributes_i& attrs);
 
   // = CosTrading::LinkAttributes methods
-  virtual CosTrading::FollowOption max_link_follow_policy (CORBA::Environment &)
+  virtual CosTrading::FollowOption max_link_follow_policy (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
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 bb72eb05cca..bac145852a7 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Coordinator.cpp
@@ -12,7 +12,9 @@
 #include "ace/Sample_History.h"
 #include "ace/Basic_Stats.h"
 
-ACE_RCSID(EC_Federated_Latency, Coordinator, "$Id$")
+ACE_RCSID (EC_Federated_Latency,
+           Coordinator,
+           "$Id$")
 
 ECFL_Coordinator::ECFL_Coordinator (int peers_expected,
                                     int iterations,
@@ -34,8 +36,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 +59,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,8 +91,8 @@ 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;
             }
         }
@@ -98,13 +100,13 @@ ECFL_Coordinator::join (Control::Peer_ptr peer,
       Control::Samples_var samples =
         this->peers_[i]->run_experiment (experiment_id,
                                          this->iterations_,
-                                         gsf,
-                                         ACE_TRY_ENV);
+                                         gsf
+                                         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;
         }
 
@@ -125,10 +127,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 b9bf1f89661..0be4f180ce6 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.cpp
@@ -20,7 +20,9 @@
 
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(EC_Federated_Latency, Peer, "$Id$")
+ACE_RCSID (EC_Federated_Latency,
+           Peer,
+           "$Id$")
 
 ECFL_Peer::ECFL_Peer (CORBA::ORB_ptr orb)
   :  orb_ (CORBA::ORB::_duplicate (orb))
@@ -32,73 +34,73 @@ 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::Long_out gsf,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Long_out gsf
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<ECFL_Consumer> consumer (
@@ -106,14 +108,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"));
@@ -130,13 +132,13 @@ 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);
 
   ACE_DEBUG ((LM_DEBUG, "Calibrating high res timer ...."));
@@ -148,13 +150,13 @@ ECFL_Peer::run_experiment (CORBA::Long experiment_id,
 }
 
 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 be0c3e028bd..2db57627b86 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Peer.h
@@ -32,31 +32,31 @@ 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::Long_out gsf,
-                                            CORBA::Environment &)
+                                            CORBA::Long_out gsf
+                                            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/Servant_var.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp
index f4a796be00b..6a0d81d8dbe 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Latency/Servant_var.cpp
@@ -23,7 +23,7 @@ Servant_var<SERVANT>::~Servant_var ()
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY {
-    this->ptr_->_remove_ref (ACE_TRY_ENV);
+    this->ptr_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
   } ACE_CATCHANY {
     // @@ This event should be logged...
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_Federated_Scalability/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp
index 147a3c4152c..fffdd125558 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.cpp
@@ -21,11 +21,11 @@ ECFS_Consumer::
 }
 
 void
-ECFS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       CORBA::Environment &ACE_TRY_ENV)
+ECFS_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 @@ ECFS_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 @@ ECFS_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
-ECFS_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECFS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -74,17 +74,17 @@ ECFS_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 @@ ECFS_Consumer::samples (void) const
 }
 
 void
-ECFS_Consumer::push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &)
+ECFS_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 @@ ECFS_Consumer::push (const RtecEventComm::EventSet &events,
 }
 
 void
-ECFS_Consumer::disconnect_push_consumer (CORBA::Environment &)
+ECFS_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_Scalability/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h
index cd1d7428edc..2bc43a51edd 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/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_Scalability/Coordinator.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp
index 41ac5aa08cf..d83acef5ae8 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.cpp
@@ -36,8 +36,8 @@ ECFS_Coordinator::~ECFS_Coordinator (void)
 }
 
 void
-ECFS_Coordinator::join (Control::Peer_ptr peer,
-                        CORBA::Environment &ACE_TRY_ENV)
+ECFS_Coordinator::join (Control::Peer_ptr peer
+                        TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   {
@@ -59,14 +59,14 @@ ECFS_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;
             }
         }
@@ -88,8 +88,8 @@ ECFS_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;
             }
         }
@@ -105,8 +105,8 @@ ECFS_Coordinator::join (Control::Peer_ptr peer,
             this->peers_[i]->run_experiment (c,
                                              experiment_id,
                                              this->iterations_,
-                                             gsf,
-                                             ACE_TRY_ENV);
+                                             gsf
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
 
           ACE_Sample_History history (samples->length ());
@@ -128,8 +128,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer,
               for (CORBA::ULong k = 0; k != samples->length (); ++k)
                 {
                   history.sample (samples[k]);
-                  ACE_OS::fprintf (output_file,
-                                   "HISTO: %d " ACE_UINT64_FORMAT_SPECIFIER "\n",
+                  ACE_OS::fprintf (output_file, "HISTO: %d %lld\n",
                                    k, samples[k] / gsf);
                 }
               ACE_OS::fclose (output_file);
@@ -147,7 +146,7 @@ ECFS_Coordinator::join (Control::Peer_ptr peer,
 
       for (j = 0; j != lcount; ++j)
         {
-          loopbacks[j]->destroy (ACE_TRY_ENV);
+          loopbacks[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -156,10 +155,10 @@ ECFS_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_Scalability/Coordinator.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h
index a59e60a69d8..b132052d174 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Coordinator.h
@@ -38,8 +38,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_Scalability/Loopback.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp
index b314b80feeb..7492cf40eb2 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.cpp
@@ -17,14 +17,14 @@ ECFS_Loopback::ECFS_Loopback (void)
 
 void
 ECFS_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<ECFS_Loopback_Supplier> (
            new ECFS_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 @@ ECFS_Loopback::init (CORBA::Long experiment_id,
             new ECFS_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
-ECFS_Loopback::destroy (CORBA::Environment &ACE_TRY_ENV)
+ECFS_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_Scalability/Loopback.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h
index 32ff0f92c8b..7dc5200feed 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/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_Scalability/Loopback_Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp
index 1d6451510d7..64635655256 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.cpp
@@ -22,11 +22,11 @@ ECFS_Loopback_Consumer::
 }
 
 void
-ECFS_Loopback_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       CORBA::Environment &ACE_TRY_ENV)
+ECFS_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 @@ ECFS_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 @@ ECFS_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
-ECFS_Loopback_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECFS_Loopback_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -75,31 +75,31 @@ ECFS_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
-ECFS_Loopback_Consumer::push (const RtecEventComm::EventSet &events,
-                              CORBA::Environment &ACE_TRY_ENV)
+ECFS_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
-ECFS_Loopback_Consumer::disconnect_push_consumer (CORBA::Environment &)
+ECFS_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_Scalability/Loopback_Consumer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h
index 50a8ec67e24..c39f3bb945f 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Consumer.h
@@ -34,19 +34,19 @@ public:
                           ECFS_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_Scalability/Loopback_Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp
index 5259385fa1f..341fabcdaac 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.cpp
@@ -17,11 +17,11 @@ ECFS_Loopback_Supplier::ECFS_Loopback_Supplier (CORBA::Long experiment_id)
 }
 
 void
-ECFS_Loopback_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                                 CORBA::Environment &ACE_TRY_ENV)
+ECFS_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 @@ ECFS_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 @@ ECFS_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
-ECFS_Loopback_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECFS_Loopback_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -65,23 +65,23 @@ ECFS_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
-ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source,
-                              CORBA::Environment &ACE_TRY_ENV)
+ECFS_Loopback_Supplier::push (const RtecEventComm::EventSet &source
+                              TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -101,11 +101,11 @@ ECFS_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
-ECFS_Loopback_Supplier::disconnect_push_supplier (CORBA::Environment &)
+ECFS_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_Scalability/Loopback_Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h
index eb40fe10eda..c09ae40a254 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Loopback_Supplier.h
@@ -35,20 +35,20 @@ public:
   ECFS_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_Scalability/Peer.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp
index 0344c4c2c00..744aa2d2acf 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.cpp
@@ -32,74 +32,74 @@ ECFS_Peer::~ECFS_Peer (void)
 }
 
 void
-ECFS_Peer::init (PortableServer::POA_ptr root_poa,
-                 CORBA::Environment &ACE_TRY_ENV)
+ECFS_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
-ECFS_Peer::channel (CORBA::Environment &)
+ECFS_Peer::channel (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return RtecEventChannelAdmin::EventChannel::_duplicate (this->event_channel_.in ());
 }
 
 void
-ECFS_Peer::connect (RtecEventChannelAdmin::EventChannel_ptr remote_ec,
-                    CORBA::Environment &ACE_TRY_ENV)
+ECFS_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
-ECFS_Peer::setup_loopback (CORBA::Long experiment_id,
-                           CORBA::Environment &ACE_TRY_ENV)
+ECFS_Peer::setup_loopback (CORBA::Long experiment_id
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<ECFS_Loopback> loopback (new ECFS_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 *
 ECFS_Peer::run_experiment (CORBA::Long consumer_count,
                            CORBA::Long experiment_id,
                            CORBA::Long iterations,
-                           CORBA::Long_out gsf,
-                           CORBA::Environment &ACE_TRY_ENV)
+                           CORBA::Long_out gsf
+                           TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Servant_var<ECFS_Consumer> *consumer;
@@ -113,7 +113,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
       consumer[i] =
         Servant_var<ECFS_Consumer> (new ECFS_Consumer (experiment_id,
                                                        iterations));
-      consumer[i]->connect (this->event_channel_.in (), ACE_TRY_ENV);
+      consumer[i]->connect (this->event_channel_.in () TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -121,7 +121,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
           new ECFS_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"));
@@ -138,11 +138,11 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
       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);
 
   Control::Samples_var samples (new Control::Samples (iterations));
@@ -159,7 +159,7 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
           if (samples[j] < sample)
             samples[j] = sample;
         }
-      consumer[i]->disconnect (ACE_TRY_ENV);
+      consumer[i]->disconnect (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (0);
     }
 
@@ -172,13 +172,13 @@ ECFS_Peer::run_experiment (CORBA::Long consumer_count,
 }
 
 void
-ECFS_Peer::shutdown (CORBA::Environment &ACE_TRY_ENV)
+ECFS_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_Scalability/Peer.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h
index 7efdc6bd39d..e5c1d1cf133 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Peer.h
@@ -32,32 +32,32 @@ public:
   virtual ~ECFS_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 consumer_count,
                                             CORBA::Long experiment_id,
                                             CORBA::Long iterations,
-                                            CORBA::Long_out gsf,
-                                            CORBA::Environment &)
+                                            CORBA::Long_out gsf
+                                            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_Scalability/Servant_var.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp
index d5ca3e9d36a..7e01fd080ab 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Servant_var.cpp
@@ -23,7 +23,7 @@ Servant_var<SERVANT>::~Servant_var ()
 
   ACE_DECLARE_NEW_CORBA_ENV;
   ACE_TRY {
-    this->ptr_->_remove_ref (ACE_TRY_ENV);
+    this->ptr_->_remove_ref (TAO_ENV_SINGLE_ARG_PARAMETER);
     ACE_TRY_CHECK;
   } ACE_CATCHANY {
     // @@ This event should be logged...
diff --git a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp
index 08cc54f957e..1c8552ab74a 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.cpp
@@ -17,11 +17,11 @@ ECFS_Supplier::ECFS_Supplier (CORBA::Long experiment_id)
 }
 
 void
-ECFS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                        CORBA::Environment &ACE_TRY_ENV)
+ECFS_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 @@ ECFS_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 @@ ECFS_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
-ECFS_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECFS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -65,23 +65,23 @@ ECFS_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
-ECFS_Supplier::push (const RtecEventComm::EventSet &events,
-                     CORBA::Environment &ACE_TRY_ENV)
+ECFS_Supplier::push (const RtecEventComm::EventSet &events
+                     TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -92,11 +92,11 @@ ECFS_Supplier::push (const RtecEventComm::EventSet &events,
     proxy = this->proxy_consumer_;
   }
 
-  proxy->push (events, ACE_TRY_ENV);
+  proxy->push (events TAO_ENV_ARG_PARAMETER);
 }
 
 void
-ECFS_Supplier::disconnect_push_supplier (CORBA::Environment &)
+ECFS_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_Scalability/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h
index 171b4ec715f..83349929b40 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/Supplier.h
@@ -35,20 +35,20 @@ public:
   ECFS_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_Scalability/client.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp
index 870ca870754..3a068ab08cb 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/client.cpp
@@ -73,7 +73,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)
@@ -81,12 +81,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 ()))
@@ -97,13 +97,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;
@@ -113,20 +113,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 ()))
@@ -135,32 +135,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<ECFS_Peer> peer_impl (new ECFS_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_Scalability/server.cpp b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp
index 5f8dd6cacc7..a6aea7fa427 100644
--- a/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Federated_Scalability/server.cpp
@@ -95,20 +95,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;
@@ -118,20 +118,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 ()))
@@ -140,10 +140,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<ECFS_Coordinator> coordinator_impl (
@@ -155,11 +155,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>
@@ -172,18 +172,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/Client_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp
index 5a622f6bbdd..3b398172a15 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/Client_Task.cpp
@@ -21,7 +21,7 @@ ECL_Client_Task::svc (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
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 4ad39ad9b6c..ff418703646 100644
--- a/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Latency/client.cpp
@@ -22,7 +22,10 @@
 #include "ace/Sched_Params.h"
 #include "ace/Task.h"
 
-ACE_RCSID(EC_Latency, client, "$Id$")
+ACE_RCSID (EC_Latency,
+           client,
+           "$Id$")
+
 
 const char *ior = "file://test.ior";
 int iterations = 10000;
@@ -57,17 +60,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 +80,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 +98,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 +113,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 +133,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 +142,7 @@ main (int argc, char *argv [])
                       1);
       PortableServer::ServantBase_var supplier_owner (supplier_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 +164,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 +198,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/performance-tests/EC_Scalability/Client_Task.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp
index a4ded501b6b..0237a86f190 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Client_Task.cpp
@@ -21,7 +21,7 @@ ECS_Client_Task::svc (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
diff --git a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp
index 6134b826bf8..788c0b061ca 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.cpp
@@ -17,11 +17,11 @@ ECS_Consumer::ECS_Consumer (int iterations)
 }
 
 void
-ECS_Consumer::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       CORBA::Environment &ACE_TRY_ENV)
+ECS_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 @@ ECS_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 @@ ECS_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
-ECS_Consumer::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECS_Consumer::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushSupplier_var proxy;
   {
@@ -69,17 +69,17 @@ ECS_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 @@ ECS_Consumer::sample_history (void)
 }
 
 void
-ECS_Consumer::push (const RtecEventComm::EventSet &events,
-                    CORBA::Environment &)
+ECS_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 @@ ECS_Consumer::push (const RtecEventComm::EventSet &events,
 }
 
 void
-ECS_Consumer::disconnect_push_consumer (CORBA::Environment &)
+ECS_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_Scalability/Consumer.h b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h
index 4bd7f38262e..8f1aee4416a 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Consumer.h
@@ -32,11 +32,11 @@ public:
   ECS_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_Scalability/Supplier.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
index 61ff20dc369..99dfd39610d 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.cpp
@@ -16,11 +16,11 @@ ECS_Supplier::ECS_Supplier (void)
 }
 
 void
-ECS_Supplier::connect (RtecEventChannelAdmin::EventChannel_ptr ec,
-                       CORBA::Environment &ACE_TRY_ENV)
+ECS_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 @@ ECS_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 @@ ECS_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
-ECS_Supplier::disconnect (CORBA::Environment &ACE_TRY_ENV)
+ECS_Supplier::disconnect (TAO_ENV_SINGLE_ARG_DECL)
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
   {
@@ -63,23 +63,23 @@ ECS_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
-ECS_Supplier::push (const RtecEventComm::EventSet &events,
-                    CORBA::Environment &ACE_TRY_ENV)
+ECS_Supplier::push (const RtecEventComm::EventSet &events
+                    TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   RtecEventChannelAdmin::ProxyPushConsumer_var proxy;
@@ -89,12 +89,12 @@ ECS_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
-ECS_Supplier::disconnect_push_supplier (CORBA::Environment &)
+ECS_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_Scalability/Supplier.h b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h
index 6e0fd8b780a..3feeb4460ab 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/Supplier.h
@@ -32,20 +32,20 @@ public:
   ECS_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_Scalability/client.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp
index c95f50fc5d0..9de742cb799 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/client.cpp
@@ -58,17 +58,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;
@@ -78,16 +78,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 ()))
@@ -96,14 +96,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)
@@ -111,12 +111,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 ()))
         {
@@ -129,13 +129,12 @@ main (int argc, char *argv [])
       ACE_NEW_RETURN (consumer_impl,
                       ECS_Consumer*[consumer_count],
                       1);
-      int i;
-      for (i = 0; i != consumer_count; ++i)
+      for (int i = 0; i != consumer_count; ++i)
         {
           ACE_NEW_RETURN (consumer_impl[i],
                           ECS_Consumer (iterations),
                           1);
-          consumer_impl[i]->connect (ec.in (), ACE_TRY_ENV);
+          consumer_impl[i]->connect (ec.in () TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -145,7 +144,7 @@ main (int argc, char *argv [])
                       1);
       PortableServer::ServantBase_var supplier_owner (supplier_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,23 +160,23 @@ main (int argc, char *argv [])
       // event[0].data.payload.length(1024);
 
       ACE_hrtime_t start = ACE_OS::gethrtime ();
-      for (i = 0; i != iterations; ++i)
+      for (int i = 0; i != iterations; ++i)
         {
           ACE_hrtime_t creation = ACE_OS::gethrtime ();
           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 ();
 
-      for (i = 0; i != consumer_count; ++i)
+      for (int i = 0; i != consumer_count; ++i)
         {
-          consumer_impl[i]->disconnect (ACE_TRY_ENV);
+          consumer_impl[i]->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
@@ -189,7 +188,7 @@ main (int argc, char *argv [])
       ACE_DEBUG ((LM_DEBUG, "Done (%d)\n", gsf));
 
       ACE_Sample_History history (iterations);
-      for (int j = 0; j != iterations; ++j)
+      for (size_t j = 0; j != iterations; ++j)
         {
           ACE_UINT64 value = 0;
           for (int i = 0; i != consumer_count; ++i)
@@ -197,7 +196,7 @@ main (int argc, char *argv [])
               ACE_Sample_History &consumer_history =
                 consumer_impl[i]->sample_history ();
 
-              ACE_UINT64 consumer_sample =
+              ACE_UINT32 consumer_sample =
                 consumer_history.get_sample (j);
               if (consumer_sample > value)
                 value = consumer_sample;
@@ -219,12 +218,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_Scalability/server.cpp b/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp
index 9145637d711..71c4b344f84 100644
--- a/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp
+++ b/TAO/orbsvcs/performance-tests/EC_Scalability/server.cpp
@@ -72,17 +72,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;
@@ -92,20 +92,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 ()))
@@ -114,13 +114,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 (),
@@ -131,15 +131,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>
@@ -152,18 +152,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/Bidirectional_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
index 6bceacbf55b..7c8defb9058 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.cpp
@@ -26,7 +26,7 @@ Receiver_StreamEndPoint::get_callback (const char *,
 
 int
 Receiver_StreamEndPoint::set_protocol_object (const char * flowname,
-					      TAO_AV_Protocol_Object *object)
+                                              TAO_AV_Protocol_Object *object)
 {
   // Set the sender protocol object corresponding to the transport
   // protocol selected.
@@ -70,17 +70,17 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 
       frame = frame->cont ();
     }
-  
+
   // Read from the file into a message block.
   int n = ACE_OS::fread (this->mb_.wr_ptr (),
-			 1,
-			 this->mb_.size (),
-			 RECEIVER::instance ()->input_file ());
-  
+                         1,
+                         this->mb_.size (),
+                         RECEIVER::instance ()->input_file ());
+
   if (n < 0)
             ACE_DEBUG ((LM_DEBUG,
-			"Receiver::receive_frame fread failed\n"));
-  
+                        "Receiver::receive_frame fread failed\n"));
+
   if (n == 0)
     {
       // At end of file break the loop and end the sender.
@@ -89,15 +89,15 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   else
     {
       this->mb_.wr_ptr (n);
-      
+
       // Send frame.
       int result =
-	RECEIVER::instance ()->protocol_object ()->send_frame (&this->mb_);
-      
+        RECEIVER::instance ()->protocol_object ()->send_frame (&this->mb_);
+
       if (result < 0)
-	ACE_DEBUG ((LM_DEBUG,
-		    "Send Frame Failed\n"));
-      
+        ACE_DEBUG ((LM_DEBUG,
+                    "Send Frame Failed\n"));
+
       // Reset the message block.
       this->mb_.reset ();
     }
@@ -117,18 +117,18 @@ Receiver_Callback::handle_destroy (void)
   if (count < 2)
     {
       ACE_TRY_NEW_ENV
-	{
-	  TAO_AV_CORE::instance ()->orb ()->shutdown (0,
-						      ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
+        {
+          TAO_AV_CORE::instance ()->orb ()->shutdown (0
+                                                      TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
       ACE_CATCHANY
-	{
-	  ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-			       "Receiver_Callback::handle_destroy Failed\n");
+        {
+          ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
+                               "Receiver_Callback::handle_destroy Failed\n");
       return -1;
-      
-	}
+
+        }
 
       ACE_ENDTRY;
     }
@@ -160,7 +160,7 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object)
 
 int
 Receiver::parse_args (int argc,
-		      char **argv)
+                      char **argv)
 {
   // Parse command line arguments
   ACE_Get_Opt opts (argc, argv, "f:r:d");
@@ -189,8 +189,8 @@ Receiver::parse_args (int argc,
 
 int
 Receiver::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 =
@@ -205,7 +205,7 @@ Receiver::init (int argc,
                       argv);
   if (result != 0)
     return result;
-  
+
   // Open file to read.
   this->input_file_ =
     ACE_OS::fopen (this->filename_.c_str (),
@@ -230,7 +230,7 @@ Receiver::init (int argc,
     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.
@@ -248,8 +248,8 @@ Receiver::init (int argc,
 
   // 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;
@@ -278,32 +278,32 @@ main (int argc,
       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);
+      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       // Make sure we have a valid <output_file>
       output_file = ACE_OS::fopen (output_file_name,
                                    "w");
@@ -319,24 +319,24 @@ main (int argc,
 
       int result =
         RECEIVER::instance ()->init (argc,
-				     argv,
-				     ACE_TRY_ENV);
+                                     argv
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       //        // Start sending data.
-      //        result = SENDER::instance ()->pace_data (ACE_TRY_ENV);
+      //        result = SENDER::instance ()->pace_data (TAO_ENV_SINGLE_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/Bidirectional_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
index 4511d5f7710..8050232c5b7 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/receiver.h
@@ -49,7 +49,7 @@ public:
 private:
   int frame_count_;
   // Keeping a count of the incoming frames.
-  
+
   ACE_Message_Block mb_;
   // Message block into which data is read from a file and then sent.
 };
@@ -93,8 +93,8 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -130,7 +130,7 @@ protected:
 
   ACE_CString filename_;
   // File from which data is read.
-  
+
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
index 28372903db4..e5b712073f8 100755
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/run_test.pl
@@ -28,7 +28,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
+    $NS->Kill ();
     exit 1;
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
index 63dab991dd3..bdc873a3ac6 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.cpp
@@ -42,8 +42,8 @@ Sender_Callback::Sender_Callback (void)
 
 int
 Sender_Callback::receive_frame (ACE_Message_Block *frame,
-				TAO_AV_frame_info *,
-				const ACE_Addr &)
+                                TAO_AV_frame_info *,
+                                const ACE_Addr &)
 {
   //
   // Upcall from the AVStreams when there is data to be received from
@@ -52,7 +52,7 @@ Sender_Callback::receive_frame (ACE_Message_Block *frame,
   ACE_DEBUG ((LM_DEBUG,
               "Sender_Callback::receive_frame for frame %d\n",
               this->frame_count_++));
-  
+
   while (frame != 0)
     {
       // Write the received data to the file.
@@ -108,15 +108,15 @@ Sender::shutdown (void)
   ACE_DECLARE_NEW_CORBA_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;
-  
+
 }
 
 int
@@ -153,7 +153,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);
@@ -162,13 +162,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 ()))
@@ -181,8 +181,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 =
@@ -219,9 +219,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"),
@@ -263,7 +263,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_,
@@ -278,8 +278,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)
@@ -292,7 +292,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;
@@ -330,7 +330,7 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
             {
               // At end of file break the loop and end the sender.
               ACE_DEBUG ((LM_DEBUG,"Handle_Start:End of file\n"));
-	      this->eof_ = 1;
+              this->eof_ = 1;
               break;
             }
 
@@ -369,8 +369,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;
                 }
             }
@@ -399,13 +399,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 (1,
-        //                                            ACE_TRY_ENV);
+        //                                            TAO_ENV_SINGLE_ARG_PARAMETER);
         ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -428,42 +428,42 @@ main (int argc,
       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 AVStreams components.
-      TAO_AV_CORE::instance ()->init (orb.in (), root_poa.in (), ACE_TRY_ENV);
+      TAO_AV_CORE::instance ()->init (orb.in (), 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)
@@ -483,9 +483,9 @@ main (int argc,
       else
         ACE_DEBUG ((LM_DEBUG,
                     "File Opened Successfull\n"));
-      
+
       // 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_Time_Value tv(3,0);
       orb->run (tv);
diff --git a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
index 8188b7f49f7..fbe82c9e994 100644
--- a/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Bidirectional_Flows/sender.h
@@ -89,25 +89,25 @@ 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);
   // Set the protocol object corresponding to the transport protocol chosen.
 
   int eof (void);
-  
+
   void shutdown (void);
 
 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_;
@@ -145,6 +145,6 @@ private:
 
   TAO_AV_Protocol_Object *protocol_object_;
   // Protocol object corresponding to the transport protocol selected.
-  
+
   int eof_;
 };
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/Multicast_Full_Profile/server.h b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
index 74c5b78db9f..7faf6c5e555 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multicast_Full_Profile/server.h
@@ -39,7 +39,7 @@ public:
 //                                                        AVStreams::QoS & the_qos,
 //                                                        CORBA::Boolean_out met_qos,
 //                                                        char *& named_fdev,
-//                                                        CORBA::Environment &env = CORBA::Environment::default_environment ());
+//                                                        TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 //   // bridge method for the application to override the consumer object
 //   // creation. Default implementation creates a TAO_FlowConsumer.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
index 4106f1c5e07..2219157b301 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.cpp
@@ -15,9 +15,9 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name,
 {
   Receiver_Callback *callback_;
   ACE_NEW_RETURN (callback_,
-		  Receiver_Callback,
-		  -1);
-  
+                  Receiver_Callback,
+                  -1);
+
   // Return the receiver application callback to the AVStreams for
   // future upcalls.
   callback = callback_;
@@ -28,7 +28,7 @@ Receiver_StreamEndPoint::get_callback (const char *flow_name,
 
 int
 Receiver_StreamEndPoint::set_protocol_object (const char * flowname,
-					      TAO_AV_Protocol_Object *object)
+                                              TAO_AV_Protocol_Object *object)
 {
   // Set the sender protocol object corresponding to the transport
   // protocol selected.
@@ -42,28 +42,28 @@ Receiver_Callback::Receiver_Callback (void)
       mb_ (BUFSIZ)
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "Receiver_Callback::Receiver_Callback\n"));
+              "Receiver_Callback::Receiver_Callback\n"));
 }
 
 void
 Receiver_Callback::flowname (const char* flow_name)
 {
   this->flowname_ = flow_name;
-  
+
   // Make sure we have a valid <output_file>
   this->output_file_ = ACE_OS::fopen (this->flowname_.c_str (),
-				      "w");
+                                      "w");
   if (this->output_file_ == 0)
     ACE_ERROR ((LM_DEBUG,
-		"Cannot open output file %s\n",
-		this->flowname_.c_str ()));
-  
+                "Cannot open output file %s\n",
+                this->flowname_.c_str ()));
+
   else
     ACE_DEBUG ((LM_DEBUG,
-		"%s File Opened Successfully\n",
-		this->flowname_.c_str ()));
-  
-  
+                "%s File Opened Successfully\n",
+                this->flowname_.c_str ()));
+
+
 }
 
 int
@@ -78,7 +78,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   ACE_DEBUG ((LM_DEBUG,
               "Receiver_Callback::receive_frame for frame %d for flow %s\n",
               this->frame_count_++,
-	      this->flowname_.c_str ()));
+              this->flowname_.c_str ()));
 
   while (frame != 0)
     {
@@ -96,7 +96,7 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
 
       frame = frame->cont ();
     }
-  
+
   return 0;
 }
 
@@ -135,7 +135,7 @@ Receiver::protocol_object (TAO_AV_Protocol_Object *object)
 
 int
 Receiver::parse_args (int argc,
-		      char **argv)
+                      char **argv)
 {
   // Parse command line arguments
   ACE_Get_Opt opts (argc, argv, "f:r:d");
@@ -164,8 +164,8 @@ Receiver::parse_args (int argc,
 
 int
 Receiver::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 =
@@ -180,7 +180,7 @@ Receiver::init (int argc,
                       argv);
   if (result != 0)
     return result;
-  
+
 
   // Register the receiver mmdevice object with the ORB
   ACE_NEW_RETURN (this->mmdevice_,
@@ -192,7 +192,7 @@ Receiver::init (int argc,
     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.
@@ -210,8 +210,8 @@ Receiver::init (int argc,
 
   // 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;
@@ -234,53 +234,53 @@ main (int argc,
       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 =
         RECEIVER::instance ()->init (argc,
-				     argv,
-				     ACE_TRY_ENV);
+                                     argv
+                                     TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      
+
       if (result != 0)
         return result;
-      
+
       while (endstream != 2)
-	{
-	  orb->perform_work (ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
+        {
+          orb->perform_work (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/Multiple_Flows/receiver.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
index 45d6b6586a4..b15d676d68f 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/receiver.h
@@ -47,11 +47,11 @@ public:
   int handle_destroy (void);
 
   void flowname (const char*);
-  
+
 private:
   int frame_count_;
   // Keeping a count of the incoming frames.
-  
+
   ACE_Message_Block mb_;
   // Message block into which data is read from a file and then sent.
 
@@ -96,8 +96,8 @@ public:
   // Destructor.
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment &);
+            char **argv
+            TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize data components.
 
   void protocol_object (TAO_AV_Protocol_Object *protocol_object);
@@ -128,7 +128,7 @@ protected:
 
   ACE_CString filename_;
   // File from which data is read.
-  
+
   int parse_args (int argc, char **argv);
   // Method to parse the command line arguments.
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
index 3f07d66d5c9..6d63232651b 100755
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/run_test.pl
@@ -28,7 +28,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
+    $NS->Kill ();
     exit 1;
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
index fbdb0919dbb..52d9ea10836 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.cpp
@@ -55,15 +55,15 @@ Sender::shutdown (void)
   ACE_DECLARE_NEW_CORBA_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;
-  
+
 }
 
 int
@@ -100,7 +100,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);
@@ -109,13 +109,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 ()))
@@ -128,8 +128,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 =
@@ -166,9 +166,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"),
@@ -210,7 +210,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_,
@@ -225,8 +225,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)
@@ -239,7 +239,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;
@@ -316,8 +316,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;
                 }
             }
@@ -325,31 +325,31 @@ Sender::pace_data (CORBA::Environment &ACE_TRY_ENV)
           // Start timer before sending the frame.
           elapsed_timer.start ();
 
-	  ProtocolObject_SetItor end = this->protocol_object_.end ();
-	  for (ProtocolObject_SetItor begin = this->protocol_object_.begin ();
-	       begin != end; ++begin)
-	    {
-	      // Send frame.
-	      int result =
-		(*begin)->send_frame (&this->mb_);
-	      
-	      if (result < 0)
-		ACE_ERROR_RETURN ((LM_ERROR,
-				   "send failed:%p",
-				   "Sender::pace_data send\n"),
-				  -1);
-	    }
-	  
-	  
+          ProtocolObject_SetItor end = this->protocol_object_.end ();
+          for (ProtocolObject_SetItor begin = this->protocol_object_.begin ();
+               begin != end; ++begin)
+            {
+              // Send frame.
+              int result =
+                (*begin)->send_frame (&this->mb_);
+        
+              if (result < 0)
+                ACE_ERROR_RETURN ((LM_ERROR,
+                                   "send failed:%p",
+                                   "Sender::pace_data send\n"),
+                                  -1);
+            }
+        
+        
           ACE_DEBUG ((LM_DEBUG,
                       "Sender::pace_data frame %d was sent succesfully\n",
                       ++this->frame_count_));
-	  
+        
           // Reset the message block.
           this->mb_.reset ();
-	  
+        
         } // end while
-      
+
       this->shutdown ();
     }
   ACE_CATCHANY
@@ -372,38 +372,38 @@ main (int argc,
       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)
@@ -412,7 +412,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/Multiple_Flows/sender.h b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
index a95d6827065..50e1c1fb481 100644
--- a/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
+++ b/TAO/orbsvcs/tests/AVStreams/Multiple_Flows/sender.h
@@ -65,11 +65,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);
@@ -81,7 +81,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_;
@@ -119,5 +119,5 @@ private:
 
   ProtocolObject_Set protocol_object_;
   // Protocol object corresponding to the transport protocol selected.
-  
+
 };
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/Pluggable_Flow_Protocol/TimeStamp.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
index 1004ea6ffa3..2a6a7dbb84b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.cpp
@@ -6,19 +6,19 @@
 //TimeStamp Protocol Object
 
 TimeStamp_Protocol_Object::TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
-						      TAO_AV_Transport *transport)
+                                                      TAO_AV_Transport *transport)
   :TAO_AV_Protocol_Object (callback,transport)
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "TimeStamp_Protocol_Object::TimeStamp_Protocol_Object\n"));
+              "TimeStamp_Protocol_Object::TimeStamp_Protocol_Object\n"));
   ACE_NEW (this->frame_,
-	   ACE_Message_Block);
+           ACE_Message_Block);
 
   this->frame_->size (4 * this->transport_->mtu ());
 }
-  
 
-int 
+
+int
 TimeStamp_Protocol_Object::handle_input (void)
 {
   int n = this->transport_->recv (this->frame_->rd_ptr (),
@@ -28,11 +28,11 @@ TimeStamp_Protocol_Object::handle_input (void)
   if (n == -1)
     ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_UDP_Flow_Handler::handle_input connection closed\n"),-1);
   this->frame_->wr_ptr (this->frame_->rd_ptr () + n);
-  
+
   return this->callback_->receive_frame (this->frame_);
 }
 
-//  int 
+//  int
 //  TimeStamp_Protocol_Object::handle_input (void)
 //  {
 //    iovec iov;
@@ -40,125 +40,125 @@ TimeStamp_Protocol_Object::handle_input (void)
 //    int n = this->transport_->recv (&iov, iovcnt);
 
 //    int frame_size = BUFSIZ;
-  
+
 //    int begin = 1;
 //    ACE_Message_Block* prev;
 //    int iov_base = 0;
 //    while (n >= frame_size)
 //      {
 //        ACE_DEBUG ((LM_DEBUG,
-//  		  "(%N|%l) Frame Size %d %d\n",
-//  		  n,
-//  		  frame_size));
+//                "(%N|%l) Frame Size %d %d\n",
+//                n,
+//                frame_size));
 
 //        ACE_Message_Block* mb;
 //        ACE_NEW_RETURN (mb,
-//  		      ACE_Message_Block(frame_size),
-//  		      -1);
+//                    ACE_Message_Block(frame_size),
+//                    -1);
 
 //        ACE_OS_String::memmove (mb->rd_ptr (), iov.iov_base, frame_size);
 //        mb->wr_ptr (mb->rd_ptr () + frame_size);
 
 //        //      iov_base += frame_size;
-      
+
 //        n -= frame_size;
 
 //        if (begin)
-//  	{
-//  	  prev = mb;
-//  	  this->frame_ = mb;
-//  	  begin = 0;
-//  	}
-//        else 
-//  	{
-//  	  prev->cont (mb);
-//  	  prev = mb;
-	  
-//  	}
+//      {
+//        prev = mb;
+//        this->frame_ = mb;
+//        begin = 0;
 //      }
-  
+//        else
+//      {
+//        prev->cont (mb);
+//        prev = mb;
+        
+//      }
+//      }
+
 //    if (n > 0)
 //      if (begin)
 //        {
-//  	ACE_DEBUG ((LM_DEBUG,
-//  		    "(%N|%l) Frame Size %d\n",
-//  		      n));
-//  	ACE_OS_String::memmove (this->frame_->rd_ptr (), iov.iov_base, n);
-//  	this->frame_->wr_ptr (this->frame_->rd_ptr () + n);
+//      ACE_DEBUG ((LM_DEBUG,
+//                  "(%N|%l) Frame Size %d\n",
+//                    n));
+//      ACE_OS_String::memmove (this->frame_->rd_ptr (), iov.iov_base, n);
+//      this->frame_->wr_ptr (this->frame_->rd_ptr () + n);
 //        }
-//      else 
+//      else
 //        {
 
-//  	ACE_DEBUG ((LM_DEBUG,
-//  		    "(%N|%l) Frame Size %d\n",
-//  		    n));
-
-//  	ACE_Message_Block* mb;
-//  	ACE_NEW_RETURN (mb,
-//  			ACE_Message_Block (frame_size),
-//  			-1);
-	
-//  	ACE_OS_String::memmove (mb->rd_ptr (), iov.iov_base, n);
-//  	mb->wr_ptr (mb->rd_ptr () + n);
-//  	prev->cont (mb);
+//      ACE_DEBUG ((LM_DEBUG,
+//                  "(%N|%l) Frame Size %d\n",
+//                  n));
+
+//      ACE_Message_Block* mb;
+//      ACE_NEW_RETURN (mb,
+//                      ACE_Message_Block (frame_size),
+//                      -1);
+        
+//      ACE_OS_String::memmove (mb->rd_ptr (), iov.iov_base, n);
+//      mb->wr_ptr (mb->rd_ptr () + n);
+//      prev->cont (mb);
 //        }
-  
+
 //    ACE_DEBUG ((LM_DEBUG,
-//  	      "IOVEC SIZE %d %d\n",
-//  	      n,
-//  	      iov.iov_len));
+//            "IOVEC SIZE %d %d\n",
+//            n,
+//            iov.iov_len));
 
 //      if (n == -1)
 //      ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Flow_Handler::handle_input recv failed\n"),-1);
 //    if (n == 0)
 //      ACE_ERROR_RETURN ((LM_ERROR,"TAO_AV_TCP_Flow_Handler::handle_input connection closed\n"),-1);
-  
+
 //    return this->callback_->receive_frame (this->frame_);
 //  }
-  
+
 /// send a data frame.
-int 
+int
 TimeStamp_Protocol_Object::send_frame (ACE_Message_Block *frame,
-				       TAO_AV_frame_info *)
+                                       TAO_AV_frame_info *)
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "TimeStamp_Protocol_Object::send_frame\n"));
-  
+              "TimeStamp_Protocol_Object::send_frame\n"));
+
   ACE_Message_Block* timestamp;
   ACE_NEW_RETURN (timestamp,
-		  ACE_Message_Block (BUFSIZ),
-		  -1);
+                  ACE_Message_Block (BUFSIZ),
+                  -1);
 
   ACE_hrtime_t now = ACE_OS::gethrtime ();
-  
+
   ACE_UINT64 usec = now;
   ACE_UINT32 val_1 = ACE_CU64_TO_CU32 (usec);
   ACE_DEBUG ((LM_DEBUG,
-	      "Time Stamp %u usecs\n",
-	      val_1));
+              "Time Stamp %u usecs\n",
+              val_1));
 
   ACE_OS_String::memcpy (timestamp->wr_ptr (), &now, sizeof (now));
   timestamp->wr_ptr (sizeof (now));
-  
+
   frame->cont (timestamp);
-  
+
   int result = this->transport_->send (frame);
   if (result < 0)
     return result;
   return 0;
 }
-  
-int 
+
+int
 TimeStamp_Protocol_Object::send_frame (iovec const* iov,
-				       int iovcnt,
-				       TAO_AV_frame_info *)
+                                       int iovcnt,
+                                       TAO_AV_frame_info *)
 {
   return this->transport_->send (iov,iovcnt);
 }
 
-int 
+int
 TimeStamp_Protocol_Object::send_frame (const char* buf,
-				       size_t len)
+                                       size_t len)
 {
   int result = this->transport_->send (buf, len, 0);
   if (result < 0)
@@ -167,7 +167,7 @@ TimeStamp_Protocol_Object::send_frame (const char* buf,
 }
 
 /// end the stream.
-int 
+int
 TimeStamp_Protocol_Object::destroy (void)
 {
   this->callback_->handle_destroy ();
@@ -187,35 +187,35 @@ int
 TimeStamp_Protocol_Factory::init (int, char **)
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "TimeStamp_Protocol_Factory::init\n"));
+              "TimeStamp_Protocol_Factory::init\n"));
   return 0;
 }
 
-int 
+int
 TimeStamp_Protocol_Factory::match_protocol (const char *flow_string)
 {
   ACE_DEBUG ((LM_DEBUG,
-	      "TimeStamp_Protocol_Factory::match_protocol\n"));
+              "TimeStamp_Protocol_Factory::match_protocol\n"));
   if (ACE_OS::strcasecmp (flow_string,"TS") == 0)
     return 1;
   return 0;
 }
 
-TimeStamp_Protocol_Object* 
+TimeStamp_Protocol_Object*
 TimeStamp_Protocol_Factory::make_protocol_object (TAO_FlowSpec_Entry *entry,
-						  TAO_Base_StreamEndPoint *endpoint,
-						  TAO_AV_Flow_Handler *handler,
-						  TAO_AV_Transport *transport)
+                                                  TAO_Base_StreamEndPoint *endpoint,
+                                                  TAO_AV_Flow_Handler *handler,
+                                                  TAO_AV_Transport *transport)
 {
   TAO_AV_Callback *callback = 0;
   endpoint->get_callback (entry->flowname (),
                           callback);
-  
-  
+
+
   TimeStamp_Protocol_Object *object = 0;
   ACE_NEW_RETURN (object,
                   TimeStamp_Protocol_Object (callback,
-					     transport),
+                                             transport),
                   0);
   callback->open (object,
                   handler);
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
index 2f7b2fc46be..7ee8b1c4f84 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/TimeStamp.h
@@ -11,28 +11,28 @@ class TAO_AV_Export TimeStamp_Protocol_Object : public TAO_AV_Protocol_Object
 {
  public:
   TimeStamp_Protocol_Object (TAO_AV_Callback *callback,
-			     TAO_AV_Transport *transport);
-  
+                             TAO_AV_Transport *transport);
+
   virtual int handle_input (void);
-  
+
   /// send a data frame.
   virtual int send_frame (ACE_Message_Block *frame,
                           TAO_AV_frame_info *frame_info = 0);
-  
+
   virtual int send_frame (iovec const* iov,
                           int iovcnt,
                           TAO_AV_frame_info *frame_info = 0);
 
   virtual int send_frame (const char*buf,
                           size_t len);
-  
+
   /// end the stream.
   virtual int destroy (void);
 
  private:
   /// Pre-allocated memory to receive the data...
   ACE_Message_Block* frame_;
-  
+
 };
 
 class TAO_AV_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Factory
@@ -44,15 +44,15 @@ class TAO_AV_Export TimeStamp_Protocol_Factory : public TAO_AV_Flow_Protocol_Fac
   virtual int init (int argc, char *argv[]);
   virtual int match_protocol (const char *flow_string);
   virtual TimeStamp_Protocol_Object* make_protocol_object (TAO_FlowSpec_Entry *entry,
-							   TAO_Base_StreamEndPoint *endpoint,
-							   TAO_AV_Flow_Handler *handler,
-							   TAO_AV_Transport *transport);
+                                                           TAO_Base_StreamEndPoint *endpoint,
+                                                           TAO_AV_Flow_Handler *handler,
+                                                           TAO_AV_Transport *transport);
 };
 
 ACE_STATIC_SVC_DECLARE (TimeStamp_Protocol_Factory)
 ACE_FACTORY_DECLARE (TAO_AV, TimeStamp_Protocol_Factory)
 
-#include "ace/post.h"     
+#include "ace/post.h"
 #endif /*TIMESTAMP_H*/
 
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
index 706f47e93c6..f5ef0bf7a7b 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/receiver.cpp
@@ -46,26 +46,26 @@ Receiver_Callback::receive_frame (ACE_Message_Block *frame,
   // Write the received data to the file.
   size_t result =
     ACE_OS::fwrite (frame->rd_ptr (),
-		    frame_size,
-		    1,
-		    output_file);
-  
+                    frame_size,
+                    1,
+                    output_file);
+
   if (result == frame->length ())
     ACE_ERROR_RETURN ((LM_ERROR,
-		       "Receiver_Callback::fwrite failed\n"),
-		      -1);
+                       "Receiver_Callback::fwrite failed\n"),
+                      -1);
   frame->rd_ptr (frame_size);
 
   ACE_hrtime_t stamp;
   ACE_OS_String::memcpy (&stamp, frame->rd_ptr (), sizeof (stamp));
-  
+
   ACE_UINT64 usec = stamp;
   ACE_UINT32 val_1 = ACE_CU64_TO_CU32 (usec);
-  
+
   ACE_DEBUG ((LM_DEBUG,
-	      "Time Stamp %u\n",
-	      val_1));
-  
+              "Time Stamp %u\n",
+              val_1));
+
   frame->reset ();
   return 0;
 }
@@ -92,8 +92,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 =
@@ -112,7 +112,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.
@@ -130,8 +130,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;
@@ -177,32 +177,32 @@ main (int argc,
       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 =
@@ -228,23 +228,23 @@ 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;
-      
+
       while (!endstream)
-	{
-	  orb->perform_work (ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
+        {
+          orb->perform_work (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/Pluggable_Flow_Protocol/run_test.pl b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
index 3f07d66d5c9..6d63232651b 100755
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/run_test.pl
@@ -28,7 +28,7 @@ $NS->Spawn ();
 
 if (PerlACE::waitforfile_timed ($nsior, 5) == -1) {
     print STDERR "ERROR: cannot find naming service IOR file\n";
-    $NS->Kill (); 
+    $NS->Kill ();
     exit 1;
 }
 
diff --git a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
index 04d695b79a9..2161de268e9 100644
--- a/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/sender.cpp
+++ b/TAO/orbsvcs/tests/AVStreams/Pluggable_Flow_Protocol/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
@@ -350,38 +350,38 @@ main (int argc,
       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)
@@ -390,7 +390,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_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_test_utils.cpp b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
index 5d9174c5da8..428869028e4 100644
--- a/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
+++ b/TAO/orbsvcs/tests/Concurrency/CC_test_utils.cpp
@@ -53,7 +53,7 @@ CC_TestUtils::create_lock_set (void)
   ACE_TRY
     {
       lock_set =
-        CC_naming_service::Instance()->get_lock_set_factory ()->create (ACE_TRY_ENV);
+        CC_naming_service::Instance()->get_lock_set_factory ()->create (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (lock_set))
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/MT_Disconnect.h b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
index 683008151f8..10ad1725717 100644
--- a/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/CosEvent/Basic/MT_Disconnect.h
@@ -34,7 +34,7 @@ public:
   // = Check the ACE_Task_Base documentation.
   int svc (void);
 
-  void run_iteration (CORBA::Environment &ACE_TRY_ENV);
+  void run_iteration (TAO_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
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 f8fc81abf3f..b952ae65529 100644
--- a/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
+++ b/TAO/orbsvcs/tests/EC_Mcast/EC_Mcast.h
@@ -1,5 +1,7 @@
-/* -*- C++ -*- */
+// -*- C++ -*-
+
 // $Id$
+
 //
 // ============================================================================
 //
@@ -111,17 +113,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)
 
@@ -164,28 +166,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:
@@ -221,24 +223,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:
@@ -266,36 +268,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;
@@ -414,41 +416,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/MT_Disconnect.h b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
index b9758c338b6..68cb65381d6 100644
--- a/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/MT_Disconnect.h
@@ -34,7 +34,7 @@ public:
   // = Check the ACE_Task_Base documentation.
   int svc (void);
 
-  void run_iteration (CORBA::Environment &ACE_TRY_ENV);
+  void run_iteration (TAO_ENV_SINGLE_ARG_DECL);
   // Run a single iteration of the test
 
 private:
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/Reconnect.h b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
index 66cfbdca3a6..34f32a5388d 100644
--- a/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
+++ b/TAO/orbsvcs/tests/Event/Basic/Reconnect.h
@@ -54,14 +54,14 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // set the reconnection 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);
   // Don't dump the EC_Driver results, they are meaningless.
 
-  void execute_consumer_test (CORBA::Environment& ACE_TRY_ENV);
-  void execute_supplier_test (CORBA::Environment& ACE_TRY_ENV);
+  void execute_consumer_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void execute_supplier_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Separate the suppliers and consumers.
 
 private:
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/Inversion.h b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
index b5c401cfe06..4f9bc592bfc 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Inversion.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Inversion.h
@@ -41,14 +41,14 @@ public:
   // The options controlling the event types are ignored, and only two
   // consumers are created.
 
-  virtual void connect_consumers (CORBA::Environment &ACE_TRY_ENV);
-  virtual void connect_suppliers (CORBA::Environment &ACE_TRY_ENV);
+  virtual void connect_consumers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  virtual void connect_suppliers (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // In this test there are two consumers, the high priority consumer
   // receives only events from a single high priority supplier.  The
   // other consumer receives events from a set of low priority
   // suppliers.
 
-  virtual void activate_tasks (CORBA::Environment &);
+  virtual void activate_tasks (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Activate the suppliers at different priorities
 
 private:
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/Performance/Throughput.cpp b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
index e77bd596f8c..5955b95febc 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.cpp
@@ -47,9 +47,9 @@ EC_Throughput::modify_attributes (TAO_EC_Event_Channel_Attributes&)
 }
 
 void
-EC_Throughput::execute_test (CORBA::Environment& ACE_TRY_ENV)
+EC_Throughput::execute_test (TAO_ENV_SINGLE_ARG_DECL)
 {
-  this->EC_Driver::execute_test (ACE_TRY_ENV);
+  this->EC_Driver::execute_test (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
diff --git a/TAO/orbsvcs/tests/Event/Performance/Throughput.h b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
index fc1cfeac8b8..8d8b222b3b2 100644
--- a/TAO/orbsvcs/tests/Event/Performance/Throughput.h
+++ b/TAO/orbsvcs/tests/Event/Performance/Throughput.h
@@ -44,7 +44,7 @@ public:
   virtual void modify_attributes (TAO_EC_Event_Channel_Attributes& attr);
   // set the throughpution 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);
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/Client_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
index fca15cc7e8f..39790e6bf9f 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/Client_i.h
@@ -42,7 +42,7 @@ public:
   Client_i (CORBA::ORB_ptr orb);
   // Our constructor
 
-  void init (CORBA::Environment &ACE_TRY_ENV);
+  void init (TAO_ENV_SINGLE_ARG_DECL);
   // Initialize the ORB etc.
 
 private:
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/IOGR/test_i.cpp b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
index 3990a7d2327..31d1e20115b 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.cpp
@@ -20,7 +20,7 @@ Simple_Server_i::Simple_Server_i (void)
 }
 
 void
-Simple_Server_i::remote_call (CORBA::Environment & /*ACE_TRY_ENV*/)
+Simple_Server_i::remote_call (TAO_ENV_SINGLE_ARG_DECL_NOT_USED /*TAO_ENV_SINGLE_ARG_PARAMETER*/)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -31,7 +31,7 @@ Simple_Server_i::remote_call (CORBA::Environment & /*ACE_TRY_ENV*/)
 
 
 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/tests/FaultTolerance/IOGR/test_i.h b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
index fb1713e4d2b..0c6638822df 100644
--- a/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
+++ b/TAO/orbsvcs/tests/FaultTolerance/IOGR/test_i.h
@@ -34,10 +34,10 @@ public:
   // ctor
 
   // = The Simple_Server methods.
-  void remote_call (CORBA::Environment &)
+  void remote_call (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/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/MCast_Server_i.cpp b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
index 6bfdb80ea84..727078a3c98 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.cpp
@@ -8,7 +8,7 @@ MCast_Server_i::MCast_Server_i (void)
 }
 
 CORBA::Boolean
-MCast_Server_i::connect_server (CORBA::Environment &)
+MCast_Server_i::connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return 0;
diff --git a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
index 7a3b81fb2b0..e626d3265b6 100644
--- a/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
+++ b/TAO/orbsvcs/tests/IOR_MCast/MCast_Server_i.h
@@ -11,7 +11,7 @@ public:
 
   // Simple method just to see that the client contacted the
   // server. If does contact, a '0' is returned.
-  CORBA::Boolean connect_server (CORBA::Environment &)
+  CORBA::Boolean connect_server (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
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_client_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
index 46be09448cf..c2e393aa2a3 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_client_i.h
@@ -61,9 +61,6 @@ private:
   /// Number of airplanes to query for.
   size_t loop_count_;
 
-  /// Environment variable.
-  CORBA::Environment env_;
-
   /// Server object ptr.
   Paper_Airplane_Server_ptr server_;
 
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
index c501db183a1..2acd8e75b87 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.cpp
@@ -26,7 +26,7 @@ Airplane_i::~Airplane_i (void)
 // Returns a random plane and page number
 
 char *
-Airplane_i::get_plane (CORBA::Environment &)
+Airplane_i::get_plane (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level)
diff --git a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
index 817a116ec88..53e121ba139 100644
--- a/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
+++ b/TAO/orbsvcs/tests/ImplRepo/airplane_i.h
@@ -48,7 +48,7 @@ public:
   ~Airplane_i (void);
 
   /// Returns a random plane.
-  virtual char *get_plane (CORBA::Environment &ACE_TRY_ENV)
+  virtual char *get_plane (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
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/IFR_Test/Admin_Client.h b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
index cedb64af3a3..f6f9e31f68c 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/IFR_Test/Admin_Client.h
@@ -50,24 +50,24 @@ public:
   // Execute test code.
 
 private:
-  void array_test (CORBA::Environment &ACE_TRY_ENV);
-  void enum_test (CORBA::Environment &ACE_TRY_ENV);
-  void alias_test (CORBA::Environment &ACE_TRY_ENV);
-  void native_test (CORBA::Environment &ACE_TRY_ENV);
-  void struct_test (CORBA::Environment &ACE_TRY_ENV);
-  void union_test (CORBA::Environment &ACE_TRY_ENV);
-  void exception_test (CORBA::Environment &ACE_TRY_ENV);
-  void constant_test (CORBA::Environment &ACE_TRY_ENV);
-  void interface_test (CORBA::Environment &ACE_TRY_ENV);
-  void move_test (CORBA::Environment &ACE_TRY_ENV);
-  void module_test (CORBA::Environment &ACE_TRY_ENV);
+  void array_test (TAO_ENV_SINGLE_ARG_DECL);
+  void enum_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void alias_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void native_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void struct_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void union_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void exception_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void constant_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void interface_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void move_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void module_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // The various IFR tests.
 
   int parse_args (int argc,
                   char *argv[]);
   // Process the command line arguments.
 
-  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(CORBA::Environment &);
+  void (Admin_Client::*test_array_[NUMBER_OF_TESTS])(TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Array of pointers to the test functions.
 
   static const char *test_names_[];
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/InterfaceRepo/Persistence_Test/Ptest.h b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
index 4cc31795596..3996b1be028 100644
--- a/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
+++ b/TAO/orbsvcs/tests/InterfaceRepo/Persistence_Test/Ptest.h
@@ -50,8 +50,8 @@ public:
   // Execute test code.
 
 private:
-  void populate (CORBA::Environment &ACE_TRY_ENV);
-  void query (CORBA::Environment &ACE_TRY_ENV);
+  void populate (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
+  void query (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // The two IFR tests.
 
   int parse_args (int argc,
diff --git a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
index 7e20da7c786..927e5f36aa2 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/client.cpp
@@ -33,7 +33,7 @@ int main (int argc, char *argv [])
       if (client.init (argc, argv) == -1)
         return 1;
 
-      result = client.run (ACE_TRY_ENV);
+      result = client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
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/Interoperable_Naming/ncontextext_client_i.h b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
index 7872b9f2d42..6592e11fe71 100644
--- a/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
+++ b/TAO/orbsvcs/tests/Interoperable_Naming/ncontextext_client_i.h
@@ -39,7 +39,7 @@ class NContextExt_Client_i
   NContextExt_Client_i (void);
   ~NContextExt_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);
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_Worker.h b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
index e4e4da436ec..3324b086ffc 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Client_Worker.h
@@ -45,7 +45,7 @@ public:
   // thread entry point
 
 private:
-  void validate_connection (CORBA::Environment &);
+  void validate_connection (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Validate the connection
 
 private:
diff --git a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
index 6709ae95527..e0e9030be77 100644
--- a/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
+++ b/TAO/orbsvcs/tests/Security/MT_SSLIOP/Server_Worker.cpp
@@ -12,7 +12,7 @@ Server_Worker::svc (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
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/Foo_i.h b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
index 19760b5b615..7af168555f1 100644
--- a/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
+++ b/TAO/orbsvcs/tests/Security/Secure_Invocation/Foo_i.h
@@ -27,13 +27,11 @@ public:
          SecurityLevel2::Current_ptr current);
 
   /// Test method.
-  virtual void baz (CORBA::Environment &ACE_TRY_ENV =
-                      TAO_default_environment ())
+  virtual void baz (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException,
                      Foo::Bar::NoSecurityAttributes));
 
-  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/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/SLevel1_Test_i.h b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
index f1716a12bf7..765d81005c0 100644
--- a/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
+++ b/TAO/orbsvcs/tests/Security/SecurityLevel1/SLevel1_Test_i.h
@@ -27,11 +27,10 @@ class SLevel1_Server_i : public POA_SLevel1_Server
                     SecurityLevel1::Current_ptr ss_current);
 
   /// Simple method invoked to test if the client reached server etc.
-  CORBA::Boolean authorize_level1 (CORBA::Environment &)
+  CORBA::Boolean authorize_level1 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     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));
 
   X509 *create_check_cert ();
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/Time/Client_i.h b/TAO/orbsvcs/tests/Time/Client_i.h
index fd674f01548..03802c59511 100644
--- a/TAO/orbsvcs/tests/Time/Client_i.h
+++ b/TAO/orbsvcs/tests/Time/Client_i.h
@@ -86,9 +86,6 @@ private:
   int shutdown_;
   // Flag for server shutdown.
 
-  CORBA::Environment env_;
-  // Environment variable.
-
   CosTime::TimeService_var clerk_;
   // Time Service Server object ptr.
 
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/client.cpp b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
index 74a390490d7..75f1fbe0608 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/client.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/client.cpp
@@ -33,7 +33,7 @@ int main (int argc, char *argv [])
         return 1;
       else
         {
-          return client.run (ACE_TRY_ENV);
+          return client.run (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/ior_corbaname_client_i.h b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
index 223dcb307ba..aad6df15978 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/ior_corbaname_client_i.h
@@ -39,7 +39,7 @@ class IOR_corbaname_Client_i
   IOR_corbaname_Client_i (void);
   ~IOR_corbaname_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);
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/ior_corbaname/status_i.cpp b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
index 46de9181071..4712b42c9fe 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.cpp
@@ -4,13 +4,13 @@
 
 #include "status_i.h"
 
-corbaname_Status_i::corbaname_Status_i (CORBA::Environment &)
+corbaname_Status_i::corbaname_Status_i (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   // Constructor
 }
 
 CORBA::Boolean
-corbaname_Status_i::print_status (CORBA::Environment &)
+corbaname_Status_i::print_status (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // If the client makes a succesful request, return a true value
diff --git a/TAO/orbsvcs/tests/ior_corbaname/status_i.h b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
index a2b172ca2de..07c1c1ce442 100644
--- a/TAO/orbsvcs/tests/ior_corbaname/status_i.h
+++ b/TAO/orbsvcs/tests/ior_corbaname/status_i.h
@@ -9,10 +9,9 @@
 
 class corbaname_Status_i : public POA_corbaname::Status {
 public:
-  corbaname_Status_i (CORBA::Environment & =
-                     TAO_default_environment());
+  corbaname_Status_i (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
 
-  CORBA::Boolean print_status (CORBA::Environment & = TAO_default_environment())
+  CORBA::Boolean print_status (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 };
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)