Merged corba-env-clean branch.

134 files changed, 1329 insertions, 1343 deletions

diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
index 7ce0d3fface..3b5956fa0ef 100644
--- a/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip.h b/TAO/performance-tests/AMI_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/AMI_Latency/Roundtrip.h
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
index d4b20578bb9..896ac02f08d 100644
--- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.cpp
@@ -23,8 +23,8 @@ Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
 }
 
 void
-Roundtrip_Handler::test_method (Test::Timestamp send_time,
-                                CORBA::Environment &)
+Roundtrip_Handler::test_method (Test::Timestamp send_time
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->pending_callbacks_--;
@@ -34,14 +34,14 @@ Roundtrip_Handler::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       this->pending_callbacks_--;
-      holder->raise_test_method (ACE_TRY_ENV);
+      holder->raise_test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -52,19 +52,19 @@ Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
 }
 
 void
-Roundtrip_Handler::shutdown (CORBA::Environment &)
+Roundtrip_Handler::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_TRY_ENV);
+      holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
index e25fc22c03c..3475d61f1df 100644
--- a/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
+++ b/TAO/performance-tests/AMI_Latency/Roundtrip_Handler.h
@@ -32,17 +32,17 @@ public:
   void dump_results (ACE_UINT32 gsf);
 
   // = The skeleton methods
-  virtual void test_method (Test::Timestamp send_time,
-                            CORBA::Environment &ACE_TRY_ENV)
+  virtual void test_method (Test::Timestamp send_time
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                  CORBA::Environment &ACE_TRY_ENV)
+  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                               CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/AMI_Latency/Server_Task.cpp b/TAO/performance-tests/AMI_Latency/Server_Task.cpp
index 7265eeabd5a..0e7197d7822 100644
--- a/TAO/performance-tests/AMI_Latency/Server_Task.cpp
+++ b/TAO/performance-tests/AMI_Latency/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_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 {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/AMI_Latency/client.cpp b/TAO/performance-tests/AMI_Latency/client.cpp
index b70854b9e5c..b706de3e081 100644
--- a/TAO/performance-tests/AMI_Latency/client.cpp
+++ b/TAO/performance-tests/AMI_Latency/client.cpp
@@ -74,11 +74,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -87,22 +87,22 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -127,10 +127,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
 
       Test::AMI_RoundtripHandler_var roundtrip_handler =
-        roundtrip_handler_impl->_this (ACE_TRY_ENV);
+        roundtrip_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_hrtime_t test_start = ACE_OS::gethrtime ();
@@ -139,11 +139,11 @@ main (int argc, char *argv[])
         {
           // Invoke asynchronous operation....
           roundtrip->sendc_test_method (roundtrip_handler.in (),
-                                        ACE_OS::gethrtime (),
-                                        ACE_TRY_ENV);
+                                        ACE_OS::gethrtime ()
+                                        TAO_ENV_ARG_PARAMETER);
 
           ACE_Time_Value tv (0, 20000);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -159,13 +159,13 @@ main (int argc, char *argv[])
                                              test_end - test_start,
                                              niterations);
 
-      roundtrip->shutdown (ACE_TRY_ENV);
+      roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/AMI_Latency/server.cpp b/TAO/performance-tests/AMI_Latency/server.cpp
index a332a8d6932..b2e88f6c0e6 100644
--- a/TAO/performance-tests/AMI_Latency/server.cpp
+++ b/TAO/performance-tests/AMI_Latency/server.cpp
@@ -75,11 +75,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -88,11 +88,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -105,11 +105,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -122,7 +122,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in ());
@@ -138,10 +138,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Callback/Callback_i.cpp b/TAO/performance-tests/Callback/Callback_i.cpp
index 3f4a993f3f1..f86c6f605cb 100644
--- a/TAO/performance-tests/Callback/Callback_i.cpp
+++ b/TAO/performance-tests/Callback/Callback_i.cpp
@@ -17,8 +17,8 @@ Callback_i::done (void)
 
 void
 Callback_i::response (Test::TimeStamp time_stamp,
-                      const Test::Payload &,
-                      CORBA::Environment &)
+                      const Test::Payload &
+                      TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
diff --git a/TAO/performance-tests/Callback/Callback_i.h b/TAO/performance-tests/Callback/Callback_i.h
index 917032bcdfb..95b9850ee4e 100644
--- a/TAO/performance-tests/Callback/Callback_i.h
+++ b/TAO/performance-tests/Callback/Callback_i.h
@@ -22,8 +22,8 @@ public:
   /// Implement the CORBA methods
   //@{
   void response (Test::TimeStamp,
-                 const Test::Payload &,
-                 CORBA::Environment &)
+                 const Test::Payload &
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
   //@}
 
diff --git a/TAO/performance-tests/Callback/Server_i.cpp b/TAO/performance-tests/Callback/Server_i.cpp
index 7859d40803b..67c2780de3e 100644
--- a/TAO/performance-tests/Callback/Server_i.cpp
+++ b/TAO/performance-tests/Callback/Server_i.cpp
@@ -9,8 +9,8 @@
 ACE_RCSID(Callback, Server_i, "$Id$")
 
 void
-Server_i::set_callback (Test::Callback_ptr callback,
-                        CORBA::Environment &)
+Server_i::set_callback (Test::Callback_ptr callback
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->callback_ = Test::Callback::_duplicate (callback);
@@ -18,18 +18,18 @@ Server_i::set_callback (Test::Callback_ptr callback,
 
 void
 Server_i::request (Test::TimeStamp time_stamp,
-                   const Test::Payload &payload,
-                   CORBA::Environment &ACE_TRY_ENV)
+                   const Test::Payload &payload
+                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (CORBA::is_nil (this->callback_.in ()))
     return;
 
-  this->callback_->response (time_stamp, payload, ACE_TRY_ENV);
+  this->callback_->response (time_stamp, payload TAO_ENV_ARG_PARAMETER);
 }
 
 void
-Server_i::shutdown (CORBA::Environment &)
+Server_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->done_ = 1;
diff --git a/TAO/performance-tests/Callback/Server_i.h b/TAO/performance-tests/Callback/Server_i.h
index e561c2c3ec8..5cf73c65ce7 100644
--- a/TAO/performance-tests/Callback/Server_i.h
+++ b/TAO/performance-tests/Callback/Server_i.h
@@ -17,16 +17,16 @@ public:
 
   /// Implement the CORBA methods
   //@{
-  void set_callback (Test::Callback_ptr callback,
-                     CORBA::Environment &)
+  void set_callback (Test::Callback_ptr callback
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   void request (Test::TimeStamp,
-                const Test::Payload &,
-                CORBA::Environment &)
+                const Test::Payload &
+                TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment&)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   //@}
diff --git a/TAO/performance-tests/Callback/client.cpp b/TAO/performance-tests/Callback/client.cpp
index 586838059e6..3b51bd5e2a7 100644
--- a/TAO/performance-tests/Callback/client.cpp
+++ b/TAO/performance-tests/Callback/client.cpp
@@ -73,17 +73,17 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -93,16 +93,16 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -111,14 +111,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -126,11 +126,11 @@ main (int argc, char *argv [])
 
       // Get the event channel object reference
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Server_var server =
-        Test::Server::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Server::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (CORBA::is_nil (server.in ()))
         {
@@ -143,10 +143,10 @@ main (int argc, char *argv [])
 
       Callback_i callback_i (iterations);
 
-      Test::Callback_var callback = callback_i._this (ACE_TRY_ENV);
+      Test::Callback_var callback = callback_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      server->set_callback (callback.in (), ACE_TRY_ENV);
+      server->set_callback (callback.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Connected callback\n"));
@@ -158,7 +158,7 @@ main (int argc, char *argv [])
       while (!callback_i.done () || !task.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -188,15 +188,15 @@ main (int argc, char *argv [])
                                              end - start,
                                              stats.samples_count ());
 
-      server->shutdown (ACE_TRY_ENV);
+      server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&callback_i, ACE_TRY_ENV);
+        root_poa->servant_to_id (&callback_i TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -223,20 +223,20 @@ parse_args (int argc, char *argv[])
         break;
 
       case 'i':
-	iterations = ACE_OS::atoi (get_opts.optarg);
-	break;
+        iterations = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
                            "-h (dump full sample history) "
-			   "-i <iterations> "
-			   "-k <IOR> "
+                           "-i <iterations> "
+                           "-k <IOR> "
                            "\n",
                            argv [0]),
                           -1);
@@ -270,7 +270,7 @@ Task::svc (void)
       for (;;)
         {
           Test::TimeStamp creation = ACE_OS::gethrtime ();
-          this->server_->request (creation, payload, ACE_TRY_ENV);
+          this->server_->request (creation, payload TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // ACE_Time_Value tv (0, 5000);
diff --git a/TAO/performance-tests/Callback/server.cpp b/TAO/performance-tests/Callback/server.cpp
index a9beeb5e404..3f86e8c1254 100644
--- a/TAO/performance-tests/Callback/server.cpp
+++ b/TAO/performance-tests/Callback/server.cpp
@@ -42,17 +42,17 @@ main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var manager_object =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (manager_object.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (manager_object.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Any sync_scope;
@@ -62,16 +62,16 @@ main (int argc, char *argv [])
       policy_list.length (1);
       policy_list[0] =
         orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                            sync_scope,
-                            ACE_TRY_ENV);
+                            sync_scope
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       policy_manager->set_policy_overrides (policy_list,
-                                            CORBA::SET_OVERRIDE,
-                                            ACE_TRY_ENV);
+                                            CORBA::SET_OVERRIDE
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -80,14 +80,14 @@ main (int argc, char *argv [])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -95,38 +95,38 @@ main (int argc, char *argv [])
 
       Server_i server_i;
 
-      Test::Server_var server = server_i._this (ACE_TRY_ENV);
+      Test::Server_var server = server_i._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var str =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ior_file_name != 0)
         {
-	  FILE *output_file = ACE_OS::fopen (ior_file_name, "w");
-	  if (output_file == 0)
-	    ACE_ERROR_RETURN ((LM_ERROR,
-			       "Cannot open output file for writing IOR: %s",
-			       ior_file_name),
-			      1);
-	  ACE_OS::fprintf (output_file, "%s", str.in ());
-	  ACE_OS::fclose (output_file);
+          FILE *output_file = ACE_OS::fopen (ior_file_name, "w");
+          if (output_file == 0)
+            ACE_ERROR_RETURN ((LM_ERROR,
+                               "Cannot open output file for writing IOR: %s",
+                               ior_file_name),
+                              1);
+          ACE_OS::fprintf (output_file, "%s", str.in ());
+          ACE_OS::fclose (output_file);
         }
 
       while (!server_i.done ())
         {
           ACE_Time_Value tv (1, 0);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       PortableServer::ObjectId_var id =
-        root_poa->servant_to_id (&server_i, ACE_TRY_ENV);
-      root_poa->deactivate_object (id.in (), ACE_TRY_ENV);
+        root_poa->servant_to_id (&server_i TAO_ENV_ARG_PARAMETER);
+      root_poa->deactivate_object (id.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::Exception, ex)
@@ -149,14 +149,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_file_name = get_opts.optarg;
-	break;
+        ior_file_name = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <ior_file_name>"
+                           "-o <ior_file_name>"
                            "\n",
                            argv [0]),
                           -1);
diff --git a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
index 8273d5089ca..fdf0a8886fa 100644
--- a/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/DII_Cubit/client.cpp
@@ -200,8 +200,8 @@ DII_Cubit_Client::init (int argc, char **argv)
       // Initialize the ORB.
       this->orb_var_ = CORBA::ORB_init (this->argc_,
                                         this->argv_,
-                                        "internet",
-                                        ACE_TRY_ENV);
+                                        "internet"
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -213,13 +213,13 @@ DII_Cubit_Client::init (int argc, char **argv)
 
       // Get a factory object reference from the factory IOR.
       this->factory_var_ =
-        this->orb_var_->string_to_object (this->factory_IOR_,
-                                          ACE_TRY_ENV);
+        this->orb_var_->string_to_object (this->factory_IOR_
+                                          TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get a Cubit object with a DII request on the Cubit factory.
-      CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit",
-                                                               ACE_TRY_ENV));
+      CORBA::Request_var mc_req (this->factory_var_->_request ("make_cubit"
+                                                               TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -233,7 +233,7 @@ DII_Cubit_Client::init (int argc, char **argv)
 
       // Invoke the <make_cubit> operation to ask the Cubit factory
       // for a Cubit object.
-      mc_req->invoke (ACE_TRY_ENV);
+      mc_req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Extract the returned object reference from the request.
@@ -387,8 +387,8 @@ DII_Cubit_Client::cube_short_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_short",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_short"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -402,7 +402,7 @@ DII_Cubit_Client::cube_short_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       req->return_value () >>= ret_short;
@@ -431,8 +431,8 @@ DII_Cubit_Client::cube_long_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_long",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_long"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -446,7 +446,7 @@ DII_Cubit_Client::cube_long_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -476,8 +476,8 @@ DII_Cubit_Client::cube_octet_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_octet",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_octet"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -493,7 +493,7 @@ DII_Cubit_Client::cube_octet_dii (void)
       // Invoke, check for an exception and verify the result.
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -524,8 +524,8 @@ DII_Cubit_Client::cube_union_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_union",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_union"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -545,7 +545,7 @@ DII_Cubit_Client::cube_union_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -579,8 +579,8 @@ DII_Cubit_Client::cube_struct_dii (void)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_struct",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_struct"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -599,7 +599,7 @@ DII_Cubit_Client::cube_struct_dii (void)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -631,8 +631,8 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence",
-                                                         ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_octet_sequence"
+                                                         TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -652,7 +652,7 @@ DII_Cubit_Client::cube_octet_seq_dii (int length)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -692,8 +692,8 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
   ACE_TRY_NEW_ENV
     {
       // Create the request ...
-      CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence",
-                                                        ACE_TRY_ENV));
+      CORBA::Request_var req (this->obj_var_->_request ("cube_long_sequence"
+                                                        TAO_ENV_ARG_PARAMETER));
 
       ACE_TRY_CHECK;
 
@@ -714,7 +714,7 @@ DII_Cubit_Client::cube_long_seq_dii (int length)
 
       this->call_count_++;
 
-      req->invoke (ACE_TRY_ENV);
+      req->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
@@ -821,13 +821,13 @@ DII_Cubit_Client::run (void)
       // Shut down server via a DII request.
       if (this->shutdown_)
         {
-          CORBA::Request_var req (this->obj_var_->_request ("shutdown",
-                                                            ACE_TRY_ENV));
+          CORBA::Request_var req (this->obj_var_->_request ("shutdown"
+                                                            TAO_ENV_ARG_PARAMETER));
 
           ACE_TRY_CHECK;
 
           // Cubit::shutdown () is a oneway operation.
-          req->send_oneway (ACE_TRY_ENV);
+          req->send_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
index aa872d04ec0..90854fdd211 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.cpp
@@ -382,7 +382,7 @@ Cubit_Client::check_enabled (unsigned int mask) const
 // Exercise the union.  Cube a union.
 
 void
-Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_union (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
@@ -397,8 +397,8 @@ Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
-        r = this->cubit_->cube_union (u,
-                                      ACE_TRY_ENV);
+        r = this->cubit_->cube_union (u
+                                      TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -425,8 +425,8 @@ Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_UNION_START);
 
-        r = this->cubit_->cube_union (u,
-                                      ACE_TRY_ENV);
+        r = this->cubit_->cube_union (u
+                                      TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -458,8 +458,8 @@ Cubit_Client::cube_union (CORBA::Environment &ACE_TRY_ENV)
 // Cube a short.
 
 void
-Cubit_Client::cube_short (int i,
-                          CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_short (int i
+                          TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -470,8 +470,8 @@ Cubit_Client::cube_short (int i,
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_SHORT_START);
 
-        ret_short = cubit_->cube_short (arg_short,
-                                        ACE_TRY_ENV);
+        ret_short = cubit_->cube_short (arg_short
+                                        TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -509,13 +509,13 @@ Cubit_Client::cube_short (int i,
 // Oneway test.
 
 void
-Cubit_Client::cube_oneway (int,
-                           CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_oneway (int
+                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ONEWAY_START);
-      this->cubit_->cube_oneway (ACE_TRY_ENV);
+      this->cubit_->cube_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -530,13 +530,13 @@ Cubit_Client::cube_oneway (int,
 }
 
 void
-Cubit_Client::cube_void (int,
-                         CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_void (int
+                         TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_VOID_START);
-      this->cubit_->cube_void (ACE_TRY_ENV);
+      this->cubit_->cube_void (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -553,8 +553,8 @@ Cubit_Client::cube_void (int,
 // Cube an octet
 
 void
-Cubit_Client::cube_octet (int i,
-                          CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_octet (int i
+                          TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -565,8 +565,8 @@ Cubit_Client::cube_octet (int i,
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_START);
 
-        ret_octet = this->cubit_->cube_octet (arg_octet,
-                                              ACE_TRY_ENV);
+        ret_octet = this->cubit_->cube_octet (arg_octet
+                                              TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -605,8 +605,8 @@ Cubit_Client::cube_octet (int i,
 // calculate the cube from a long
 
 void
-Cubit_Client::cube_long (int i,
-                         CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_long (int i
+                         TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -617,8 +617,8 @@ Cubit_Client::cube_long (int i,
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_START);
 
-        ret_long = this->cubit_->cube_long (arg_long,
-                                            ACE_TRY_ENV);
+        ret_long = this->cubit_->cube_long (arg_long
+                                            TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -660,8 +660,8 @@ Cubit_Client::cube_long (int i,
 // Cube the numbers in a struct
 
 void
-Cubit_Client::cube_struct (int i,
-                           CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_struct (int i
+                           TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -678,8 +678,8 @@ Cubit_Client::cube_struct (int i,
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_STRUCT_START);
 
-        ret_struct = this->cubit_->cube_struct (arg_struct,
-                                                ACE_TRY_ENV);
+        ret_struct = this->cubit_->cube_struct (arg_struct
+                                                TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -717,8 +717,8 @@ Cubit_Client::cube_struct (int i,
 
 void
 Cubit_Client::cube_long_sequence (int,
-                                  int l,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  int l
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -745,8 +745,8 @@ Cubit_Client::cube_long_sequence (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_LONG_SEQUENCE_START);
 
         this->cubit_->cube_long_sequence (input,
-                                          vout,
-                                          ACE_TRY_ENV);
+                                          vout
+                                          TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -790,8 +790,8 @@ Cubit_Client::cube_long_sequence (int,
 
 void
 Cubit_Client::cube_octet_sequence (int,
-                                   int l,
-                                   CORBA::Environment &ACE_TRY_ENV)
+                                   int l
+                                   TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -819,8 +819,8 @@ Cubit_Client::cube_octet_sequence (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_OCTET_SEQUENCE_START);
 
         this->cubit_->cube_octet_sequence (input,
-                                           vout,
-                                           ACE_TRY_ENV);
+                                           vout
+                                           TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -865,8 +865,8 @@ Cubit_Client::cube_octet_sequence (int,
 
 void
 Cubit_Client::cube_many_sequence (int,
-                                  int l,
-                                  CORBA::Environment &ACE_TRY_ENV)
+                                  int l
+                                  TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -901,8 +901,8 @@ Cubit_Client::cube_many_sequence (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_MANY_SEQUENCE_START);
 
         this->cubit_->cube_many_sequence (input,
-                                          vout,
-                                          ACE_TRY_ENV);
+                                          vout
+                                          TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -950,8 +950,8 @@ Cubit_Client::cube_many_sequence (int,
 void
 Cubit_Client::cube_rti_data (int,
                              int numUpdates,
-                             int numAttrs,
-                             CORBA::Environment &ACE_TRY_ENV)
+                             int numAttrs
+                             TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -1021,8 +1021,8 @@ Cubit_Client::cube_rti_data (int,
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_RTI_DATA_START);
 
         this->cubit_->cube_rti_data (input,
-                                     vout,
-                                     ACE_TRY_ENV);
+                                     vout
+                                     TAO_ENV_ARG_PARAMETER);
       }
 
       ACE_TRY_CHECK;
@@ -1053,8 +1053,8 @@ Cubit_Client::cube_rti_data (int,
 // calculate the cube from long contained in an any
 
 void
-Cubit_Client::cube_any (int i,
-                        CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_any (int i
+                        TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -1068,8 +1068,8 @@ Cubit_Client::cube_any (int i,
       arg_any <<= arg_long;
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_START);
-        ret_any = this->cubit_->cube_any (arg_any,
-                                          ACE_TRY_ENV);
+        ret_any = this->cubit_->cube_any (arg_any
+                                          TAO_ENV_ARG_PARAMETER);
       }
       ACE_TRY_CHECK;
 
@@ -1113,8 +1113,8 @@ Cubit_Client::cube_any (int i,
 // Cube the numbers in a struct
 
 void
-Cubit_Client::cube_any_struct (int i,
-                               CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::cube_any_struct (int i
+                               TAO_ENV_ARG_DECL)
 {
   ACE_TRY
     {
@@ -1133,8 +1133,8 @@ Cubit_Client::cube_any_struct (int i,
       arg_any <<= arg_struct;
       {
         ACE_FUNCTION_TIMEPROBE (CUBIT_CLIENT_CUBE_ANY_STRUCT_START);
-        ret_any = this->cubit_->cube_any_struct (arg_any,
-                                                 ACE_TRY_ENV);
+        ret_any = this->cubit_->cube_any_struct (arg_any
+                                                 TAO_ENV_ARG_PARAMETER);
       }
       ACE_TRY_CHECK;
 
@@ -1246,7 +1246,7 @@ Cubit_Client::run ()
 
   // Show the results one type at a time.
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // VOID
@@ -1258,8 +1258,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_void (i,
-                               ACE_TRY_ENV);
+              this->cube_void (i
+                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1279,8 +1279,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_short (i,
-                                ACE_TRY_ENV);
+              this->cube_short (i
+                                TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1300,8 +1300,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_octet (i,
-                                ACE_TRY_ENV);
+              this->cube_octet (i
+                                TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1321,8 +1321,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_long (i,
-                               ACE_TRY_ENV);
+              this->cube_long (i
+                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1341,8 +1341,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_struct (i,
-                                 ACE_TRY_ENV);
+              this->cube_struct (i
+                                 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1362,7 +1362,7 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_union (ACE_TRY_ENV);
+              this->cube_union (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1383,8 +1383,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_long_sequence (this->loop_count_,
-                                        4,
-                                        ACE_TRY_ENV);
+                                        4
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1405,8 +1405,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_long_sequence (this->loop_count_,
-                                        1024,
-                                        ACE_TRY_ENV);
+                                        1024
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1432,8 +1432,8 @@ Cubit_Client::run ()
               for (i = 0; i < this->loop_count_; ++i)
                 {
                   this->cube_octet_sequence (this->loop_count_,
-                                             bytes_in_octet_sequence_,
-                                             ACE_TRY_ENV);
+                                             bytes_in_octet_sequence_
+                                             TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -1442,8 +1442,8 @@ Cubit_Client::run ()
               for (i = 0; i < this->loop_count_; ++i)
                 {
                   this->cube_octet_sequence (this->loop_count_,
-                                             16,
-                                             ACE_TRY_ENV);
+                                             16
+                                             TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
                 }
             }
@@ -1465,8 +1465,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_octet_sequence (this->loop_count_,
-                                         4096,
-                                         ACE_TRY_ENV);
+                                         4096
+                                         TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1487,8 +1487,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_many_sequence (this->loop_count_,
-                                        4,
-                                        ACE_TRY_ENV);
+                                        4
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1509,8 +1509,8 @@ Cubit_Client::run ()
           for (i = 0; i < this->loop_count_; ++i)
             {
               this->cube_many_sequence (this->loop_count_,
-                                        1024,
-                                        ACE_TRY_ENV);
+                                        1024
+                                        TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1530,16 +1530,16 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_short (i,
-                                ACE_TRY_ENV);
+              this->cube_short (i
+                                TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              this->cube_octet (i,
-                                ACE_TRY_ENV);
+              this->cube_octet (i
+                                TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
-              this->cube_long (i,
-                               ACE_TRY_ENV);
+              this->cube_long (i
+                               TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1560,8 +1560,8 @@ Cubit_Client::run ()
             {
               this->cube_rti_data (this->loop_count_,
                                    2,
-                                   5,
-                                   ACE_TRY_ENV);
+                                   5
+                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1581,8 +1581,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_oneway (i,
-                                 ACE_TRY_ENV);
+              this->cube_oneway (i
+                                 TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1602,8 +1602,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_any (i,
-                              ACE_TRY_ENV);
+              this->cube_any (i
+                              TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
@@ -1622,8 +1622,8 @@ Cubit_Client::run ()
 
           for (i = 0; i < this->loop_count_; ++i)
             {
-              this->cube_any_struct (i,
-                                     ACE_TRY_ENV);
+              this->cube_any_struct (i
+                                     TAO_ENV_ARG_PARAMETER);
 
               ACE_TRY_CHECK;
             }
@@ -1635,8 +1635,8 @@ Cubit_Client::run ()
                              elapsed_time);
         }
 
-      this->shutdown_server (this->shutdown_,
-                             ACE_TRY_ENV);
+      this->shutdown_server (this->shutdown_
+                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -1650,8 +1650,8 @@ Cubit_Client::run ()
 }
 
 int
-Cubit_Client::shutdown_server (int do_shutdown,
-                               CORBA::Environment &ACE_TRY_ENV)
+Cubit_Client::shutdown_server (int do_shutdown
+                               TAO_ENV_ARG_DECL)
 {
   if (do_shutdown)
     {
@@ -1660,7 +1660,7 @@ Cubit_Client::shutdown_server (int do_shutdown,
 
       ACE_TRY_EX(NOT_COLLOCATED)
         {
-          this->cubit_->shutdown (ACE_TRY_ENV);
+          this->cubit_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (NOT_COLLOCATED);
         }
       ACE_CATCHANY
@@ -1713,8 +1713,8 @@ Cubit_Client::init (int argc, char **argv)
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse command line and verify parameters.
@@ -1743,13 +1743,13 @@ Cubit_Client::init (int argc, char **argv)
         }
 
       CORBA::Object_var factory_object =
-        this->orb_->string_to_object (this->cubit_factory_key_,
-                                      ACE_TRY_ENV);
+        this->orb_->string_to_object (this->cubit_factory_key_
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->factory_ =
-        Cubit_Factory::_narrow (factory_object.in(),
-                                ACE_TRY_ENV);
+        Cubit_Factory::_narrow (factory_object.in()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
@@ -1765,7 +1765,7 @@ Cubit_Client::init (int argc, char **argv)
 
       // Now retrieve the Cubit obj ref corresponding to the key.
       this->cubit_ =
-        this->factory_->make_cubit (ACE_TRY_ENV);
+        this->factory_->make_cubit (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->cubit_.in ()))
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
index 5899ad7c74d..1915358559c 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Client.h
@@ -82,59 +82,59 @@ private:
                     ACE_Profile_Timer::ACE_Elapsed_Time &elapsed_time);
   // Prints the time stats.
 
-  void cube_union (CORBA::Environment &ACE_TRY_ENV);
+  void cube_union (TAO_ENV_SINGLE_ARG_DECL);
   // Exercise the union.  Cube a union.
 
-  void cube_struct (int i,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void cube_struct (int i
+                    TAO_ENV_ARG_DECL);
   // calculate the cube from a struct.
 
-  void cube_long (int i,
-                  CORBA::Environment &ACE_TRY_ENV);
+  void cube_long (int i
+                  TAO_ENV_ARG_DECL);
   // calculate the cube from a long.
 
-  void cube_oneway (int i,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void cube_oneway (int i
+                    TAO_ENV_ARG_DECL);
   // Oneway operation test.
 
-  void cube_void (int i,
-                  CORBA::Environment &ACE_TRY_ENV);
+  void cube_void (int i
+                  TAO_ENV_ARG_DECL);
   // Twoway operation test.
 
-  void cube_octet (int i,
-                   CORBA::Environment &ACE_TRY_ENV);
+  void cube_octet (int i
+                   TAO_ENV_ARG_DECL);
   // Cube an octet.
 
-  void cube_short (int i,
-                   CORBA::Environment &ACE_TRY_ENV);
+  void cube_short (int i
+                   TAO_ENV_ARG_DECL);
   // Cube a short.
 
-  void cube_long_sequence (int i, int l,
-                           CORBA::Environment &ACE_TRY_ENV);
+  void cube_long_sequence (int i, int l
+                           TAO_ENV_ARG_DECL);
   // Cube a sequence <l> is the length of the sequence.
 
-  void cube_octet_sequence (int i, int l,
-                            CORBA::Environment &ACE_TRY_ENV);
+  void cube_octet_sequence (int i, int l
+                            TAO_ENV_ARG_DECL);
   // Cube a sequence of octets, <l> is the length of the sequence.
 
-  void cube_many_sequence (int i, int l,
-                           CORBA::Environment &ACE_TRY_ENV);
+  void cube_many_sequence (int i, int l
+                           TAO_ENV_ARG_DECL);
   // Cube a sequence of manys, <l> is the length of the sequence.
 
-  void cube_rti_data (int i, int numUpdates, int numAttrs,
-                      CORBA::Environment &ACE_TRY_ENV);
+  void cube_rti_data (int i, int numUpdates, int numAttrs
+                      TAO_ENV_ARG_DECL);
   // Cube a sequence <l> is the length of the sequence.
 
-  void cube_any_struct (int i,
-                    CORBA::Environment &ACE_TRY_ENV);
+  void cube_any_struct (int i
+                    TAO_ENV_ARG_DECL);
   // calculate the cube from a struct in an any.
 
-  void cube_any (int i,
-                 CORBA::Environment &ACE_TRY_ENV);
+  void cube_any (int i
+                 TAO_ENV_ARG_DECL);
   // calculate the cube from a long in an any.
 
-  int shutdown_server (int do_shutdown,
-                       CORBA::Environment &ACE_TRY_ENV);
+  int shutdown_server (int do_shutdown
+                       TAO_ENV_ARG_DECL);
   // Invoke the method with <do_shutdown> != 0 to shutdown the server.
 
   int argc_;
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
index f54292b49bb..313495d228b 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.cpp
@@ -55,15 +55,15 @@ Cubit_Server::parse_args (void)
 
 int
 Cubit_Server::init (int argc,
-                    char** argv,
-                    CORBA::Environment& ACE_TRY_ENV)
+                    char** argv
+                    TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -88,8 +88,8 @@ Cubit_Server::init (int argc,
 
   this->factory_id_ =
     this->orb_manager_.activate_under_child_poa ("factory",
-                                                 this->factory_impl_,
-                                                 ACE_TRY_ENV);
+                                                 this->factory_impl_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -108,9 +108,9 @@ Cubit_Server::init (int argc,
 }
 
 int
-Cubit_Server::run (CORBA::Environment& env)
+Cubit_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
-  if (this->orb_manager_.run (env) == -1)
+  if (this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "Cubit_Server::run"),
                       -1);
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
index 633b4424037..d31269dd6ee 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_Server.h
@@ -51,11 +51,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the Cubit_Server state - parsing arguments and ...
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
index 73897ae501b..6eca9eb5f98 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.cpp
@@ -126,10 +126,10 @@ Cubit_Factory_i::~Cubit_Factory_i (void)
 }
 
 Cubit_ptr
-Cubit_Factory_i::make_cubit (CORBA::Environment &env)
+Cubit_Factory_i::make_cubit (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  return my_cubit_._this (env);
+  return my_cubit_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
@@ -152,7 +152,7 @@ Cubit_i::~Cubit_i (void)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (CORBA::Environment &)
+Cubit_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
@@ -164,14 +164,14 @@ Cubit_i::set_default_poa (PortableServer::POA_ptr poa)
 }
 
 void
-Cubit_i::cube_oneway (CORBA::Environment &)
+Cubit_i::cube_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ONEWAY_START);
 }
 
 void
-Cubit_i::cube_void (CORBA::Environment &)
+Cubit_i::cube_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_VOID_START);
@@ -180,54 +180,50 @@ Cubit_i::cube_void (CORBA::Environment &)
 // Cube an octet
 
 CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o,
-                     CORBA::Environment &env)
+Cubit_i::cube_octet (CORBA::Octet o
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_START);
 
-  ACE_UNUSED_ARG (env);
   return o * o * o;
 }
 
 // Cube a short.
 
 CORBA::Short
-Cubit_i::cube_short (CORBA::Short s,
-                     CORBA::Environment &env)
+Cubit_i::cube_short (CORBA::Short s
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_SHORT_START);
 
-  ACE_UNUSED_ARG (env);
   return s * s * s;
 }
 
 // Cube a long
 
 CORBA::Long
-Cubit_i::cube_long (CORBA::Long l,
-                    CORBA::Environment &env)
+Cubit_i::cube_long (CORBA::Long l
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_START);
 
-  ACE_UNUSED_ARG (env);
   return l * l * l;
 }
 
 // Cube a struct
 
 Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values,
-                      CORBA::Environment &env)
+Cubit_i::cube_struct (const Cubit::Many &values
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_STRUCT_START);
 
   Cubit::Many temp;
 
-  ACE_UNUSED_ARG (env);
   temp.o = values.o * values.o * values.o;
   temp.s = values.s * values.s * values.s;
   temp.l = values.l * values.l * values.l;
@@ -238,15 +234,14 @@ Cubit_i::cube_struct (const Cubit::Many &values,
 // Cube a union
 
 Cubit::oneof
-Cubit_i::cube_union (const Cubit::oneof &values,
-                     CORBA::Environment &env)
+Cubit_i::cube_union (const Cubit::oneof &values
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_UNION_START);
 
   Cubit::oneof temp;
 
-  ACE_UNUSED_ARG (env);
   switch (values._d ())
     {
     case Cubit::e_0th:
@@ -273,8 +268,8 @@ Cubit_i::cube_union (const Cubit::oneof &values,
 // Cube a sequence
 void
 Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
-                             Cubit::long_seq_out output,
-                             CORBA::Environment &)
+                             Cubit::long_seq_out output
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
@@ -300,8 +295,8 @@ Cubit_i::cube_long_sequence (const Cubit::long_seq &input,
 // Cube an octet sequence
 void
 Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
-                              Cubit::octet_seq_out output,
-                              CORBA::Environment &)
+                              Cubit::octet_seq_out output
+                              TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_OCTET_SEQUENCE_START);
@@ -341,8 +336,8 @@ Cubit_i::cube_octet_sequence (const Cubit::octet_seq &input,
 
 void
 Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
-                             Cubit::many_seq_out output,
-                             CORBA::Environment &)
+                             Cubit::many_seq_out output
+                             TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_MANY_SEQUENCE_START);
@@ -375,8 +370,8 @@ Cubit_i::cube_many_sequence (const Cubit::many_seq & input,
 
 void
 Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
-                        Cubit::RtiPacket_out output,
-                        CORBA::Environment &)
+                        Cubit::RtiPacket_out output
+                        TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_LONG_SEQUENCE_START);
@@ -407,13 +402,12 @@ Cubit_i::cube_rti_data (const Cubit::RtiPacket &input,
 // Cube a long contained in an any
 
 CORBA::Any *
-Cubit_i::cube_any (const CORBA::Any & any,
-                   CORBA::Environment &env)
+Cubit_i::cube_any (const CORBA::Any & any
+                   TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_START);
 
-  ACE_UNUSED_ARG (env);
   CORBA::Long l;
   any >>= l;
   l = l * l * l;
@@ -425,14 +419,13 @@ Cubit_i::cube_any (const CORBA::Any & any,
 // Cube a struct contained in an any
 
 CORBA::Any *
-Cubit_i::cube_any_struct (const CORBA::Any & any,
-                          CORBA::Environment &env)
+Cubit_i::cube_any_struct (const CORBA::Any & any
+                          TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (CUBIT_I_CUBE_ANY_STRUCT_START);
   Cubit::Many * arg_struct;
   Cubit::Many ret_struct;
-  ACE_UNUSED_ARG (env);
   any >>= arg_struct;
 
   ret_struct.o = arg_struct->o * arg_struct->o * arg_struct->o;
@@ -446,7 +439,7 @@ Cubit_i::cube_any_struct (const CORBA::Any & any,
 
 // Shutdown.
 
-void Cubit_i::shutdown (CORBA::Environment &)
+void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
index 06245519b80..454be029601 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/Cubit_i.h
@@ -37,77 +37,77 @@ public:
   ~Cubit_i (void);
   // Destructor
 
-  virtual PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV = TAO_default_environment ());
+  virtual PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // Returns the default POA for this servant.
 
-  virtual void cube_oneway (CORBA::Environment &env)
+  virtual void cube_oneway (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a oneway call.
 
-  virtual void cube_void (CORBA::Environment &env)
+  virtual void cube_void (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a twoway call.
 
-  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env)
+  virtual CORBA::Octet cube_octet (CORBA::Octet o
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an octet
 
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env)
+  virtual CORBA::Short cube_short (CORBA::Short s
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a short
 
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env)
+  virtual CORBA::Long cube_long (CORBA::Long l
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a long
 
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env)
+  virtual Cubit::Many cube_struct (const Cubit::Many &values
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a struct.
 
-  virtual Cubit::oneof cube_union (const Cubit::oneof &values,
-                                   CORBA::Environment &env)
+  virtual Cubit::oneof cube_union (const Cubit::oneof &values
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a union.
 
   virtual void cube_long_sequence (const Cubit::long_seq &input,
-                                   Cubit::long_seq_out output,
-                                   CORBA::Environment &env)
+                                   Cubit::long_seq_out output
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a sequence.
 
   virtual void cube_octet_sequence (const Cubit::octet_seq &input,
-                                    Cubit::octet_seq_out output,
-                                    CORBA::Environment &_env)
+                                    Cubit::octet_seq_out output
+                                    TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an octet sequence.
 
   virtual void cube_many_sequence (const Cubit::many_seq & input,
-                                   Cubit::many_seq_out output,
-                                   CORBA::Environment &_tao_environment)
+                                   Cubit::many_seq_out output
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube an Many sequence.
 
   virtual void cube_rti_data (const Cubit::RtiPacket &input,
-                              Cubit::RtiPacket_out output,
-                              CORBA::Environment &env)
+                              Cubit::RtiPacket_out output
+                              TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a sequence.
 
-  virtual CORBA::Any * cube_any (const CORBA::Any & any,
-                                CORBA::Environment &env)
+  virtual CORBA::Any * cube_any (const CORBA::Any & any
+                                TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a long in an any
 
-  virtual CORBA::Any * cube_any_struct (const CORBA::Any & any,
-                                       CORBA::Environment &env)
+  virtual CORBA::Any * cube_any_struct (const CORBA::Any & any
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Cube a struct in an any
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown routine.
 
@@ -135,7 +135,7 @@ public:
   ~Cubit_Factory_i (void);
   // Destructor.
 
-  virtual Cubit_ptr make_cubit (CORBA::Environment &env)
+  virtual Cubit_ptr make_cubit (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Make a cubit object.
 
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
index ece59a9223c..bd4b767c5a4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/collocation_test.cpp
@@ -43,15 +43,15 @@ svr_worker (void *arg)
   ACE_TRY_NEW_ENV
     {
       int result = cubit_server.init (args.argc (),
-                                      args.argv (),
-                                      ACE_TRY_ENV);
+                                      args.argv ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result == -1)
         return (void *) 1;
 
       barrier->server_init_.wait ();
-      cubit_server.run (ACE_TRY_ENV);
+      cubit_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       barrier->client_fini_.wait ();
diff --git a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
index 9279da7ee3a..af690c0ace4 100644
--- a/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
+++ b/TAO/performance-tests/Cubit/TAO/IDL_Cubit/server.cpp
@@ -46,13 +46,13 @@ main (int argc, char *argv[])
               "\n\tIDL_Cubit: server\n\n"));
   ACE_TRY_NEW_ENV
     {
-      int ret = cubit_server.init (argc, argv, ACE_TRY_ENV);
+      int ret = cubit_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (ret == -1)
         return -1;
 
-      cubit_server.run (ACE_TRY_ENV);
+      cubit_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_OS::sleep (5);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
index 8b5ea0b0310..1105a5a099c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Cubit_Task.cpp
@@ -64,14 +64,14 @@ Cubit_Task::svc (void)
                        "Create Servants failed.\n"),
                       -1);
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       GLOBALS::instance ()->barrier_->wait ();
 
       // Handle requests for this object until we're killed, or one of
       // the methods asks us to exit.
-      int r = this->orb_manager_.run (ACE_TRY_ENV);
+      int r = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
@@ -84,7 +84,7 @@ Cubit_Task::svc (void)
       CORBA::ORB_var orb =
         this->orb_manager_.orb ();
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -105,7 +105,7 @@ Cubit_Task::svc (void)
 int
 Cubit_Task::initialize_orb (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       ACE_ARGV args (this->orbargs_);
@@ -121,8 +121,8 @@ Cubit_Task::initialize_orb (void)
       int r = this->orb_manager_.init_child_poa (argc,
                                                  argv,
                                                  "persistent_poa",
-                                                 orb_name,
-                                                 ACE_TRY_ENV);
+                                                 orb_name
+                                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         return -1;
@@ -166,23 +166,23 @@ Cubit_Task::get_servant_ior (u_int index)
 int
 Cubit_Task::create_servants (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       CORBA::Object_var obj =
-        this->orb_->resolve_initial_references ("RootPOA",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
-        PortableServer::POA::_narrow (obj.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var manager =
-        poa->the_POAManager(ACE_TRY_ENV);
+        poa->the_POAManager(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      manager->activate(ACE_TRY_ENV);
+      manager->activate(TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create the array of cubit implementations.
@@ -232,13 +232,13 @@ Cubit_Task::create_servants (void)
           // some client.  Then release the object.
 
           Cubit_var cubit =
-            this->servants_[i]->_this (ACE_TRY_ENV);
+            this->servants_[i]->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
 
           CORBA::String_var str =
-            this->orb_->object_to_string (cubit.in (),
-                                          ACE_TRY_ENV);
+            this->orb_->object_to_string (cubit.in ()
+                                          TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           this->servants_iors_[i] =
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
index 770718a9684..8235905755c 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.cpp
@@ -553,7 +553,7 @@ Client::find_frequency (void)
 }
 
 CORBA::ORB_ptr
-Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
+Client::init_orb (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "I'm thread %t\n"));
@@ -582,8 +582,8 @@ Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
   ACE_OS::sprintf (orbid, "orb:%d", this->id_);
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         argv,
-                                        orbid,
-                                        ACE_TRY_ENV);
+                                        orbid
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (CORBA::ORB::_nil ());
 
   if (this->id_ == 0)
@@ -613,7 +613,7 @@ Client::init_orb (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
+Client::get_cubit (CORBA::ORB_ptr orb TAO_ENV_ARG_DECL)
 {
   char *my_ior =
     this->ts_->use_utilization_test_ == 1
@@ -632,8 +632,8 @@ Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
                       -1);
 
   CORBA::Object_var objref =
-    orb->string_to_object (my_ior,
-                           ACE_TRY_ENV);
+    orb->string_to_object (my_ior
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (objref.in ()))
@@ -643,8 +643,8 @@ Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
 
   // Narrow the CORBA::Object reference to the stub object,
   // checking the type along the way using _is_a.
-  this->cubit_ = Cubit::_narrow (objref.in (),
-                                 ACE_TRY_ENV);
+  this->cubit_ = Cubit::_narrow (objref.in ()
+                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   if (CORBA::is_nil (this->cubit_))
@@ -656,8 +656,8 @@ Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
               "(%t) Binding succeeded\n"));
 
   CORBA::String_var str =
-    orb->object_to_string (this->cubit_,
-                           ACE_TRY_ENV);
+    orb->object_to_string (this->cubit_
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -670,18 +670,18 @@ Client::get_cubit (CORBA::ORB_ptr orb, CORBA::Environment &ACE_TRY_ENV)
 int
 Client::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       // Initialize the ORB.
-      CORBA::ORB_var orb = this->init_orb (ACE_TRY_ENV);
+      CORBA::ORB_var orb = this->init_orb (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Find the frequency of CORBA requests based on thread id.
       this->find_frequency ();
 
       // Get the cubit object from the file.
-      int r = this->get_cubit (orb.in (), ACE_TRY_ENV);
+      int r = this->get_cubit (orb.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r != 0)
         return r;
@@ -716,14 +716,14 @@ Client::svc (void)
         {
           ACE_DEBUG ((LM_DEBUG,
                       "(%t) CALLING SHUTDOWN() ON THE SERVANT\n"));
-          this->cubit_->shutdown (ACE_TRY_ENV);
+          this->cubit_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
       CORBA::release (this->cubit_);
       this->cubit_ = 0;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -746,7 +746,7 @@ Client::svc (void)
 int
 Client::cube_octet (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->call_count_++;
@@ -757,11 +757,11 @@ Client::cube_octet (void)
       START_QUANTIFY;
 
       if (this->ts_->use_utilization_test_ == 1 && this->ts_->remote_invocations_ == 0)
-        ret_octet = this->cubit_impl_.cube_octet (arg_octet,
-                                                  ACE_TRY_ENV);
+        ret_octet = this->cubit_impl_.cube_octet (arg_octet
+                                                  TAO_ENV_ARG_PARAMETER);
       else
-        ret_octet = this->cubit_->cube_octet (arg_octet,
-                                              ACE_TRY_ENV);
+        ret_octet = this->cubit_->cube_octet (arg_octet
+                                              TAO_ENV_ARG_PARAMETER);
 
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
@@ -792,7 +792,7 @@ Client::cube_octet (void)
 int
 Client::cube_short (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->call_count_++;
@@ -801,8 +801,8 @@ Client::cube_short (void)
       CORBA::Short ret_short;
 
       START_QUANTIFY;
-      ret_short = this->cubit_->cube_short (arg_short,
-                                            ACE_TRY_ENV);
+      ret_short = this->cubit_->cube_short (arg_short
+                                            TAO_ENV_ARG_PARAMETER);
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
       arg_short = arg_short * arg_short * arg_short;
@@ -829,7 +829,7 @@ Client::cube_short (void)
 int
 Client::cube_long (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       this->call_count_++;
@@ -838,8 +838,8 @@ Client::cube_long (void)
       CORBA::Long ret_long;
 
       START_QUANTIFY;
-      ret_long = this->cubit_->cube_long (arg_long,
-                                          ACE_TRY_ENV);
+      ret_long = this->cubit_->cube_long (arg_long
+                                          TAO_ENV_ARG_PARAMETER);
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
 
@@ -866,7 +866,7 @@ Client::cube_long (void)
 int
 Client::cube_struct (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
       Cubit::Many arg_struct;
@@ -879,8 +879,8 @@ Client::cube_struct (void)
       arg_struct.o = func (this->num_);
 
       START_QUANTIFY;
-      ret_struct = this->cubit_->cube_struct (arg_struct,
-                                              ACE_TRY_ENV);
+      ret_struct = this->cubit_->cube_struct (arg_struct
+                                              TAO_ENV_ARG_PARAMETER);
       STOP_QUANTIFY;
       ACE_TRY_CHECK;
 
@@ -940,12 +940,12 @@ Client::make_request (void)
     }
   else
     {
-      ACE_DECLARE_NEW_CORBA_ENV;
+      TAO_ENV_DECLARE_NEW_ENV;
       ACE_TRY
         {
           this->call_count_++;
           START_QUANTIFY;
-          this->cubit_->noop (ACE_TRY_ENV);
+          this->cubit_->noop (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           STOP_QUANTIFY;
         }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
index 4472daab77c..554ad87b619 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/Task_Client.h
@@ -279,14 +279,14 @@ public:
   // cubed.
 
 private:
-  CORBA::ORB_ptr init_orb (CORBA::Environment &ACE_TRY_ENV);
+  CORBA::ORB_ptr init_orb (TAO_ENV_SINGLE_ARG_DECL);
   // initialize the ORB.
 
   void read_ior (void);
   // reads the cubit ior from a file.
 
-  int get_cubit (CORBA::ORB_ptr orb,
-                 CORBA::Environment &ACE_TRY_ENV);
+  int get_cubit (CORBA::ORB_ptr orb
+                 TAO_ENV_ARG_DECL);
   // gets the cubit object.
 
   int run_tests (void);
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
index f27c6c029f9..8de8568c427 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.cpp
@@ -18,32 +18,32 @@ Cubit_i::~Cubit_i (void)
 }
 
 CORBA::Octet
-Cubit_i::cube_octet (CORBA::Octet o,
-                     CORBA::Environment &)
+Cubit_i::cube_octet (CORBA::Octet o
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Octet) (o * o * o);
 }
 
 CORBA::Short
-Cubit_i::cube_short (CORBA::Short s,
-                     CORBA::Environment &)
+Cubit_i::cube_short (CORBA::Short s
+                     TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Short) (s * s * s);
 }
 
 CORBA::Long
-Cubit_i::cube_long (CORBA::Long l,
-                    CORBA::Environment &)
+Cubit_i::cube_long (CORBA::Long l
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return (CORBA::Long) (l * l * l);
 }
 
 Cubit::Many
-Cubit_i::cube_struct (const Cubit::Many &values,
-                      CORBA::Environment &)
+Cubit_i::cube_struct (const Cubit::Many &values
+                      TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Cubit::Many out_values;
@@ -56,13 +56,13 @@ Cubit_i::cube_struct (const Cubit::Many &values,
 }
 
 void
-Cubit_i::noop (CORBA::Environment &)
+Cubit_i::noop (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   // does nothing.
 }
 
-void Cubit_i::shutdown (CORBA::Environment &)
+void Cubit_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
@@ -71,7 +71,7 @@ void Cubit_i::shutdown (CORBA::Environment &)
 }
 
 PortableServer::POA_ptr
-Cubit_i::_default_POA (CORBA::Environment &)
+Cubit_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
diff --git a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
index 1c8f2cad34d..bc65208821d 100644
--- a/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
+++ b/TAO/performance-tests/Cubit/TAO/MT_Cubit/cubit_i.h
@@ -29,30 +29,30 @@ public:
            PortableServer::POA_ptr poa);
   ~Cubit_i (void);
 
-  virtual CORBA::Octet cube_octet (CORBA::Octet o,
-                                   CORBA::Environment &env)
+  virtual CORBA::Octet cube_octet (CORBA::Octet o
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Short cube_short (CORBA::Short s,
-                                   CORBA::Environment &env)
+  virtual CORBA::Short cube_short (CORBA::Short s
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual CORBA::Long cube_long (CORBA::Long l,
-                                 CORBA::Environment &env)
+  virtual CORBA::Long cube_long (CORBA::Long l
+                                 TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual Cubit::Many cube_struct (const Cubit::Many &values,
-                                   CORBA::Environment &env)
+  virtual Cubit::Many cube_struct (const Cubit::Many &values
+                                   TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void noop (CORBA::Environment &env)
+  virtual void noop (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
   virtual PortableServer::POA_ptr
-      _default_POA (CORBA::Environment &ACE_TRY_ENV);
+      _default_POA (TAO_ENV_SINGLE_ARG_DECL);
   // The default POA
 
 protected:
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.cpp b/TAO/performance-tests/DII_Latency/Roundtrip.cpp
index 8d780f15724..c211bfe9bc6 100644
--- a/TAO/performance-tests/DII_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/DII_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/DII_Latency/Roundtrip.h b/TAO/performance-tests/DII_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/DII_Latency/Roundtrip.h
+++ b/TAO/performance-tests/DII_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/DII_Latency/client.cpp b/TAO/performance-tests/DII_Latency/client.cpp
index e5161b45f1f..482e58c9e40 100644
--- a/TAO/performance-tests/DII_Latency/client.cpp
+++ b/TAO/performance-tests/DII_Latency/client.cpp
@@ -82,14 +82,14 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -103,14 +103,14 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           CORBA::Request_var request =
-            object->_request ("test_method", ACE_TRY_ENV);
+            object->_request ("test_method" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ULongLong dummy = 0;
           request->add_in_arg("send_time") <<= dummy;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -122,13 +122,13 @@ main (int argc, char *argv[])
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           CORBA::Request_var request =
-            object->_request ("test_method", ACE_TRY_ENV);
+            object->_request ("test_method" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           request->add_in_arg("send_time") <<= start;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -159,10 +159,10 @@ main (int argc, char *argv[])
       if (do_shutdown)
         {
           CORBA::Request_var request =
-            object->_request ("shutdown", ACE_TRY_ENV);
+            object->_request ("shutdown" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
diff --git a/TAO/performance-tests/DII_Latency/server.cpp b/TAO/performance-tests/DII_Latency/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/DII_Latency/server.cpp
+++ b/TAO/performance-tests/DII_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
index c82471f6199..fb1d5cc8570 100644
--- a/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/DSI_Latency/Roundtrip.cpp
@@ -12,12 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request,
-                   CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::invoke (CORBA::ServerRequest_ptr request
+                   TAO_ENV_ARG_DECL)
 {
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0, ACE_TRY_ENV);
+      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -26,18 +26,18 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list, ACE_TRY_ENV);
+      this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Any type_id (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN,
-                       ACE_TRY_ENV);
+      list->add_value ("type_id", type_id, CORBA::ARG_IN
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->arguments (list, ACE_TRY_ENV);
+      request->arguments (list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
+      CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *arg;
@@ -52,7 +52,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
       CORBA::Any result;
       result <<= CORBA::Any::from_boolean (type_matches);
 
-      request->set_result (result, ACE_TRY_ENV);
+      request->set_result (result TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -61,21 +61,21 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list, ACE_TRY_ENV);
+      this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Any send_time (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN,
-                       ACE_TRY_ENV);
+      list->add_value ("send_time", send_time, CORBA::ARG_IN
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->arguments (list, ACE_TRY_ENV);
+      request->arguments (list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
+      CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->set_result (*(nv->value ()), ACE_TRY_ENV);
+      request->set_result (*(nv->value ()) TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -84,14 +84,14 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   CORBA::Any bad_operation;
   CORBA::BAD_OPERATION exception;
   bad_operation <<= exception;
-  request->set_exception (bad_operation, ACE_TRY_ENV);
+  request->set_exception (bad_operation TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::RepositoryId
 Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr,
-                               CORBA::Environment &)
+                               PortableServer::POA_ptr
+                               TAO_ENV_ARG_DECL_NOT_USED)
 {
   return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
 }
diff --git a/TAO/performance-tests/DSI_Latency/Roundtrip.h b/TAO/performance-tests/DSI_Latency/Roundtrip.h
index 443773bc9ef..563cf2cd1e7 100644
--- a/TAO/performance-tests/DSI_Latency/Roundtrip.h
+++ b/TAO/performance-tests/DSI_Latency/Roundtrip.h
@@ -27,12 +27,12 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The DSI methods
-  virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &ACE_TRY_ENV);
+  virtual void invoke (CORBA::ServerRequest_ptr request
+                       TAO_ENV_ARG_DECL);
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa,
-      CORBA_Environment &ACE_TRY_ENV);
+      PortableServer::POA_ptr poa
+      TAO_ENV_ARG_DECL);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/DSI_Latency/client.cpp b/TAO/performance-tests/DSI_Latency/client.cpp
index 30c10985240..482ba2f894c 100644
--- a/TAO/performance-tests/DSI_Latency/client.cpp
+++ b/TAO/performance-tests/DSI_Latency/client.cpp
@@ -82,18 +82,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -148,7 +148,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/DSI_Latency/server.cpp b/TAO/performance-tests/DSI_Latency/server.cpp
index b9a151045c4..3cf93d52143 100644
--- a/TAO/performance-tests/DSI_Latency/server.cpp
+++ b/TAO/performance-tests/DSI_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,17 +94,17 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (roundtrip_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (roundtrip_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var roundtrip =
-        root_poa->id_to_reference (oid.in (),
-                                   ACE_TRY_ENV);
+        root_poa->id_to_reference (oid.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -117,18 +117,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp b/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
index 81bdd10b90a..64a2f05468a 100644
--- a/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/Deferred_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Deferred_Latency/Roundtrip.h b/TAO/performance-tests/Deferred_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Deferred_Latency/Roundtrip.h
+++ b/TAO/performance-tests/Deferred_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Deferred_Latency/client.cpp b/TAO/performance-tests/Deferred_Latency/client.cpp
index aee7b04814c..a2ee46b8d11 100644
--- a/TAO/performance-tests/Deferred_Latency/client.cpp
+++ b/TAO/performance-tests/Deferred_Latency/client.cpp
@@ -93,18 +93,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -138,20 +138,20 @@ main (int argc, char *argv[])
               CORBA::ULongLong start = ACE_OS::gethrtime ();
 
               request[j] =
-                roundtrip->_request ("test_method",
-                                     ACE_TRY_ENV);
+                roundtrip->_request ("test_method"
+                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               request[j]->add_in_arg () <<= start;
               request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-              request[j]->send_deferred (ACE_TRY_ENV);
+              request[j]->send_deferred (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
           for (j = 0; j != burst; ++j)
             {
-              request[j]->get_response (ACE_TRY_ENV);
+              request[j]->get_response (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::ULongLong retval;
@@ -187,7 +187,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Deferred_Latency/server.cpp b/TAO/performance-tests/Deferred_Latency/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Deferred_Latency/server.cpp
+++ b/TAO/performance-tests/Deferred_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
index 7ce0d3fface..3b5956fa0ef 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip.h b/TAO/performance-tests/Latency/AMI/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
index d4b20578bb9..896ac02f08d 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.cpp
@@ -23,8 +23,8 @@ Roundtrip_Handler::dump_results (ACE_UINT32 gsf)
 }
 
 void
-Roundtrip_Handler::test_method (Test::Timestamp send_time,
-                                CORBA::Environment &)
+Roundtrip_Handler::test_method (Test::Timestamp send_time
+                                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   this->pending_callbacks_--;
@@ -34,14 +34,14 @@ Roundtrip_Handler::test_method (Test::Timestamp send_time,
 }
 
 void
-Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                      CORBA::Environment &ACE_TRY_ENV)
+Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                      TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
       this->pending_callbacks_--;
-      holder->raise_test_method (ACE_TRY_ENV);
+      holder->raise_test_method (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
@@ -52,19 +52,19 @@ Roundtrip_Handler::test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
 }
 
 void
-Roundtrip_Handler::shutdown (CORBA::Environment &)
+Roundtrip_Handler::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                   CORBA::Environment &ACE_TRY_ENV)
+Roundtrip_Handler::shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                   TAO_ENV_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_TRY
     {
-      holder->raise_shutdown (ACE_TRY_ENV);
+      holder->raise_shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
index e25fc22c03c..3475d61f1df 100644
--- a/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
+++ b/TAO/performance-tests/Latency/AMI/Roundtrip_Handler.h
@@ -32,17 +32,17 @@ public:
   void dump_results (ACE_UINT32 gsf);
 
   // = The skeleton methods
-  virtual void test_method (Test::Timestamp send_time,
-                            CORBA::Environment &ACE_TRY_ENV)
+  virtual void test_method (Test::Timestamp send_time
+                            TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                                  CORBA::Environment &ACE_TRY_ENV)
+  virtual void test_method_excep (Test::AMI_RoundtripExceptionHolder *holder
+                                  TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
-  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder,
-                               CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown_excep (Test::AMI_RoundtripExceptionHolder *holder
+                               TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/AMI/Server_Task.cpp b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
index 7265eeabd5a..0e7197d7822 100644
--- a/TAO/performance-tests/Latency/AMI/Server_Task.cpp
+++ b/TAO/performance-tests/Latency/AMI/Server_Task.cpp
@@ -16,7 +16,7 @@ Server_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 {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Latency/AMI/client.cpp b/TAO/performance-tests/Latency/AMI/client.cpp
index b70854b9e5c..b706de3e081 100644
--- a/TAO/performance-tests/Latency/AMI/client.cpp
+++ b/TAO/performance-tests/Latency/AMI/client.cpp
@@ -74,11 +74,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -87,22 +87,22 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -116,7 +116,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -127,10 +127,10 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_handler_impl);
 
       Test::AMI_RoundtripHandler_var roundtrip_handler =
-        roundtrip_handler_impl->_this (ACE_TRY_ENV);
+        roundtrip_handler_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_hrtime_t test_start = ACE_OS::gethrtime ();
@@ -139,11 +139,11 @@ main (int argc, char *argv[])
         {
           // Invoke asynchronous operation....
           roundtrip->sendc_test_method (roundtrip_handler.in (),
-                                        ACE_OS::gethrtime (),
-                                        ACE_TRY_ENV);
+                                        ACE_OS::gethrtime ()
+                                        TAO_ENV_ARG_PARAMETER);
 
           ACE_Time_Value tv (0, 20000);
-          orb->run (tv, ACE_TRY_ENV);
+          orb->run (tv TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -159,13 +159,13 @@ main (int argc, char *argv[])
                                              test_end - test_start,
                                              niterations);
 
-      roundtrip->shutdown (ACE_TRY_ENV);
+      roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/AMI/server.cpp b/TAO/performance-tests/Latency/AMI/server.cpp
index a332a8d6932..b2e88f6c0e6 100644
--- a/TAO/performance-tests/Latency/AMI/server.cpp
+++ b/TAO/performance-tests/Latency/AMI/server.cpp
@@ -75,11 +75,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -88,11 +88,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -105,11 +105,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -122,7 +122,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Server_Task server_task (orb.in ());
@@ -138,10 +138,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.cpp b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
index 8d780f15724..c211bfe9bc6 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/DII/Roundtrip.h b/TAO/performance-tests/Latency/DII/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/DII/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DII/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/DII/client.cpp b/TAO/performance-tests/Latency/DII/client.cpp
index e5161b45f1f..482e58c9e40 100644
--- a/TAO/performance-tests/Latency/DII/client.cpp
+++ b/TAO/performance-tests/Latency/DII/client.cpp
@@ -82,14 +82,14 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (object.in ()))
@@ -103,14 +103,14 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           CORBA::Request_var request =
-            object->_request ("test_method", ACE_TRY_ENV);
+            object->_request ("test_method" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           CORBA::ULongLong dummy = 0;
           request->add_in_arg("send_time") <<= dummy;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -122,13 +122,13 @@ main (int argc, char *argv[])
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
           CORBA::Request_var request =
-            object->_request ("test_method", ACE_TRY_ENV);
+            object->_request ("test_method" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           request->add_in_arg("send_time") <<= start;
 
           request->set_return_type (CORBA::_tc_ulonglong);
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -159,10 +159,10 @@ main (int argc, char *argv[])
       if (do_shutdown)
         {
           CORBA::Request_var request =
-            object->_request ("shutdown", ACE_TRY_ENV);
+            object->_request ("shutdown" TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-          request->invoke (ACE_TRY_ENV);
+          request->invoke (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
         }
diff --git a/TAO/performance-tests/Latency/DII/server.cpp b/TAO/performance-tests/Latency/DII/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Latency/DII/server.cpp
+++ b/TAO/performance-tests/Latency/DII/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
index c82471f6199..fb1d5cc8570 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.cpp
@@ -12,12 +12,12 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 void
-Roundtrip::invoke (CORBA::ServerRequest_ptr request,
-                   CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::invoke (CORBA::ServerRequest_ptr request
+                   TAO_ENV_ARG_DECL)
 {
   if (ACE_OS::strcmp ("shutdown", request->operation ()) == 0)
     {
-      this->orb_->shutdown (0, ACE_TRY_ENV);
+      this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -26,18 +26,18 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   else if (ACE_OS::strcmp ("_is_a", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list, ACE_TRY_ENV);
+      this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Any type_id (CORBA::_tc_string);
-      list->add_value ("type_id", type_id, CORBA::ARG_IN,
-                       ACE_TRY_ENV);
+      list->add_value ("type_id", type_id, CORBA::ARG_IN
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->arguments (list, ACE_TRY_ENV);
+      request->arguments (list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
+      CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       const char *arg;
@@ -52,7 +52,7 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
       CORBA::Any result;
       result <<= CORBA::Any::from_boolean (type_matches);
 
-      request->set_result (result, ACE_TRY_ENV);
+      request->set_result (result TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -61,21 +61,21 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   else if (ACE_OS::strcmp ("test_method", request->operation ()) == 0)
     {
       CORBA::NVList_ptr list;
-      this->orb_->create_list (0, list, ACE_TRY_ENV);
+      this->orb_->create_list (0, list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       CORBA::Any send_time (CORBA::_tc_ulonglong);
-      list->add_value ("send_time", send_time, CORBA::ARG_IN,
-                       ACE_TRY_ENV);
+      list->add_value ("send_time", send_time, CORBA::ARG_IN
+                       TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->arguments (list, ACE_TRY_ENV);
+      request->arguments (list TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      CORBA::NamedValue_ptr nv = list->item (0, ACE_TRY_ENV);
+      CORBA::NamedValue_ptr nv = list->item (0 TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
-      request->set_result (*(nv->value ()), ACE_TRY_ENV);
+      request->set_result (*(nv->value ()) TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
       return;
@@ -84,14 +84,14 @@ Roundtrip::invoke (CORBA::ServerRequest_ptr request,
   CORBA::Any bad_operation;
   CORBA::BAD_OPERATION exception;
   bad_operation <<= exception;
-  request->set_exception (bad_operation, ACE_TRY_ENV);
+  request->set_exception (bad_operation TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
 CORBA::RepositoryId
 Roundtrip::_primary_interface (const PortableServer::ObjectId &,
-                               PortableServer::POA_ptr,
-                               CORBA::Environment &)
+                               PortableServer::POA_ptr
+                               TAO_ENV_ARG_DECL_NOT_USED)
 {
   return CORBA::string_dup ("IDL:Test/Roundtrip:1.0");
 }
diff --git a/TAO/performance-tests/Latency/DSI/Roundtrip.h b/TAO/performance-tests/Latency/DSI/Roundtrip.h
index 443773bc9ef..563cf2cd1e7 100644
--- a/TAO/performance-tests/Latency/DSI/Roundtrip.h
+++ b/TAO/performance-tests/Latency/DSI/Roundtrip.h
@@ -27,12 +27,12 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The DSI methods
-  virtual void invoke (CORBA::ServerRequest_ptr request,
-                       CORBA_Environment &ACE_TRY_ENV);
+  virtual void invoke (CORBA::ServerRequest_ptr request
+                       TAO_ENV_ARG_DECL);
   virtual CORBA::RepositoryId _primary_interface (
       const PortableServer::ObjectId &oid,
-      PortableServer::POA_ptr poa,
-      CORBA_Environment &ACE_TRY_ENV);
+      PortableServer::POA_ptr poa
+      TAO_ENV_ARG_DECL);
 
 private:
   /// Use an ORB reference to conver strings to objects and shutdown
diff --git a/TAO/performance-tests/Latency/DSI/client.cpp b/TAO/performance-tests/Latency/DSI/client.cpp
index 30c10985240..482ba2f894c 100644
--- a/TAO/performance-tests/Latency/DSI/client.cpp
+++ b/TAO/performance-tests/Latency/DSI/client.cpp
@@ -82,18 +82,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -107,7 +107,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -148,7 +148,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/DSI/server.cpp b/TAO/performance-tests/Latency/DSI/server.cpp
index b9a151045c4..3cf93d52143 100644
--- a/TAO/performance-tests/Latency/DSI/server.cpp
+++ b/TAO/performance-tests/Latency/DSI/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,17 +94,17 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (roundtrip_impl,
-                                   ACE_TRY_ENV);
+        root_poa->activate_object (roundtrip_impl
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var roundtrip =
-        root_poa->id_to_reference (oid.in (),
-                                   ACE_TRY_ENV);
+        root_poa->id_to_reference (oid.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -117,18 +117,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
index 81bdd10b90a..64a2f05468a 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/Deferred/Roundtrip.h b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/Deferred/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Deferred/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Deferred/client.cpp b/TAO/performance-tests/Latency/Deferred/client.cpp
index aee7b04814c..a2ee46b8d11 100644
--- a/TAO/performance-tests/Latency/Deferred/client.cpp
+++ b/TAO/performance-tests/Latency/Deferred/client.cpp
@@ -93,18 +93,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -118,7 +118,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -138,20 +138,20 @@ main (int argc, char *argv[])
               CORBA::ULongLong start = ACE_OS::gethrtime ();
 
               request[j] =
-                roundtrip->_request ("test_method",
-                                     ACE_TRY_ENV);
+                roundtrip->_request ("test_method"
+                                     TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               request[j]->add_in_arg () <<= start;
               request[j]->set_return_type (CORBA::_tc_ulonglong);
 
-              request[j]->send_deferred (ACE_TRY_ENV);
+              request[j]->send_deferred (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
           for (j = 0; j != burst; ++j)
             {
-              request[j]->get_response (ACE_TRY_ENV);
+              request[j]->get_response (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               CORBA::ULongLong retval;
@@ -187,7 +187,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/Deferred/server.cpp b/TAO/performance-tests/Latency/Deferred/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Latency/Deferred/server.cpp
+++ b/TAO/performance-tests/Latency/Deferred/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
index 81bdd10b90a..64a2f05468a 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Single_Threaded/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Single_Threaded/client.cpp b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
index b89b3efb533..976dfc67a00 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/client.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/client.cpp
@@ -83,18 +83,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -149,7 +149,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/Single_Threaded/server.cpp b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Latency/Single_Threaded/server.cpp
+++ b/TAO/performance-tests/Latency/Single_Threaded/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
index 3271329b0db..ee32b19f696 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.cpp
@@ -15,17 +15,17 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -50,14 +50,14 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
       ACE_TRY
         {
-          (void) this->roundtrip_->test_method (dummy, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (dummy TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
index 1655e0f8847..a75172e8161 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Client_Task.h
@@ -29,7 +29,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (CORBA::Environment &ACE_TRY_ENV);
+  void validate_connection (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
index 76f101734c9..eb8e866becc 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
index 896f685f99d..a38a0fe51b4 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/client.cpp
@@ -76,18 +76,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
index 912b380725a..00e272a02fa 100644
--- a/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Per_Connection/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
index 8f88421e8a0..97f1ef0a50b 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.cpp
@@ -15,17 +15,17 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -50,14 +50,14 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
       ACE_TRY
         {
-          (void) this->roundtrip_->test_method (dummy, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (dummy TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
index 1655e0f8847..a75172e8161 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Client_Task.h
@@ -29,7 +29,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (CORBA::Environment &ACE_TRY_ENV);
+  void validate_connection (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
index 01a2dce839d..0337e54c34f 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
+++ b/TAO/performance-tests/Latency/Thread_Pool/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
index bcd94b6d1f7..50a9ba7e898 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/Worker_Thread.cpp
@@ -16,7 +16,7 @@ Worker_Thread::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 {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Latency/Thread_Pool/client.cpp b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
index a522c394b8c..f3ef1a10bd1 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/client.cpp
@@ -76,18 +76,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Latency/Thread_Pool/server.cpp b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
index 503d226a4c7..7090cfdf18e 100644
--- a/TAO/performance-tests/Latency/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/Latency/Thread_Pool/server.cpp
@@ -65,11 +65,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -78,11 +78,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -95,11 +95,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker_Thread worker (orb.in ());
@@ -122,10 +122,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
index 793e0ca8e70..46b6edd2b4b 100644
--- a/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
+++ b/TAO/performance-tests/POA/Create_Reference/create_reference.cpp
@@ -74,8 +74,8 @@ set_rt_scheduling (void)
 
 void
 object_creation_test (PortableServer::POA_ptr poa,
-                      int create_reference_with_id,
-                      CORBA::Environment &ACE_TRY_ENV)
+                      int create_reference_with_id
+                      TAO_ENV_ARG_DECL)
 {
   ACE_DEBUG ((LM_DEBUG,
               "\nCreating %d object references with %s\n",
@@ -101,15 +101,15 @@ object_creation_test (PortableServer::POA_ptr poa,
         {
           object =
             poa->create_reference_with_id (oid.in (),
-                                           "IDL:Test/Simple:1.0",
-                                           ACE_TRY_ENV);
+                                           "IDL:Test/Simple:1.0"
+                                           TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
       else
         {
           object =
-            poa->create_reference ("IDL:Test/Simple:1.0",
-                                   ACE_TRY_ENV);
+            poa->create_reference ("IDL:Test/Simple:1.0"
+                                   TAO_ENV_ARG_PARAMETER);
           ACE_CHECK;
         }
 
@@ -135,13 +135,13 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "",
-                         ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -150,15 +150,15 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -167,33 +167,33 @@ main (int argc, char *argv[])
       CORBA::PolicyList policies(1); policies.length (1);
 
       policies[0] =
-        root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                               ACE_TRY_ENV);
+        root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var child_poa =
         root_poa->create_POA ("TestPOA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       object_creation_test (root_poa.in (),
-                            0, // POA::create_reference
-                            ACE_TRY_ENV);
+                            0  // POA::create_reference
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object_creation_test (child_poa.in (),
-                            1, // POA::create_reference_with_id
-                            ACE_TRY_ENV);
+                            1  // POA::create_reference_with_id
+                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Demux/client.cpp b/TAO/performance-tests/POA/Demux/client.cpp
index b657312df7b..22f2bd9048f 100644
--- a/TAO/performance-tests/POA/Demux/client.cpp
+++ b/TAO/performance-tests/POA/Demux/client.cpp
@@ -33,13 +33,13 @@ main (int argc, char *argv [])
 
   ACE_TRY_NEW_ENV;
     {
-      int r = demux_test_client.init (argc, argv,
-                                      ACE_TRY_ENV);
+      int r = demux_test_client.init (argc, argv
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       if (r == -1)
         return -1;
 
-      demux_test_client.run (ACE_TRY_ENV);
+      demux_test_client.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.cpp b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
index 87c64e773a7..cd69c06c803 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.cpp
@@ -44,8 +44,8 @@ Demux_Test_Client::~Demux_Test_Client (void)
 //
 
 int
-Demux_Test_Client::init (int argc, char *argv [],
-                         CORBA::Environment &ACE_TRY_ENV)
+Demux_Test_Client::init (int argc, char *argv []
+                         TAO_ENV_ARG_DECL)
 {
   this->argc_ = argc;
   this->argv_ = argv;
@@ -55,7 +55,7 @@ Demux_Test_Client::init (int argc, char *argv [],
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (GET_ORB);
     }
   ACE_CATCHANY
@@ -101,14 +101,14 @@ Demux_Test_Client::init (int argc, char *argv [],
         // Get the IOR and output it to the file
         ACE_TRY_EX (IOR)
           {
-            CORBA::Object_var objref = this->orb_->string_to_object (str,
-                                                                     ACE_TRY_ENV);
+            CORBA::Object_var objref = this->orb_->string_to_object (str
+                                                                     TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK_EX (IOR);
 
             // now narrow to Demux_Test object
 
-            this->demux_test_[i][j] = Demux_Test::_narrow (objref.in (),
-                                                           ACE_TRY_ENV);
+            this->demux_test_[i][j] = Demux_Test::_narrow (objref.in ()
+                                                           TAO_ENV_ARG_PARAMETER);
 
             ACE_TRY_CHECK_EX (IOR);
 
@@ -252,7 +252,7 @@ Demux_Test_Client::parse_args (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV)
+Demux_Test_Client::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   // open a temporary results file
   if ((this->result_fp_ = ACE_OS::fopen ("results.dat", "w")) == 0)
@@ -267,19 +267,19 @@ Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV)
       switch (this->is_)
         {
         case Demux_Test_Client::LINEAR:
-          (void) this->run_linear_test (ACE_TRY_ENV);
+          (void) this->run_linear_test (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::RANDOM:
-          (void) this->run_random_test (ACE_TRY_ENV);
+          (void) this->run_random_test (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::BEST:
-          (void) this->run_best_test (ACE_TRY_ENV);
+          (void) this->run_best_test (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         case Demux_Test_Client::WORST:
-          (void) this->run_worst_test (ACE_TRY_ENV);
+          (void) this->run_worst_test (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (RUN);
           break;
         }
@@ -301,7 +301,7 @@ Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV)
   ACE_TRY_EX (SHUTDOWN)
     {
       // call the shutdown method one the first object
-      this->demux_test_[0][0]->shutdown (ACE_TRY_ENV);
+      this->demux_test_[0][0]->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (SHUTDOWN);
     }
   ACE_CATCHANY
@@ -329,7 +329,7 @@ Demux_Test_Client::run (CORBA::Environment &ACE_TRY_ENV)
 }
 
 int
-Demux_Test_Client::run_linear_test (CORBA::Environment &env)
+Demux_Test_Client::run_linear_test (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULong j, k, l, m;
   ACE_hrtime_t start, end;
@@ -342,7 +342,7 @@ Demux_Test_Client::run_linear_test (CORBA::Environment &env)
             start = ACE_OS::gethrtime ();
 
             // invoke the method
-            this->op_db_[l].op_ (this->demux_test_[j][k].in (), env);
+            this->op_db_[l].op_ (this->demux_test_[j][k].in () TAO_ENV_ARG_PARAMETER);
 
             end = ACE_OS::gethrtime ();
 
@@ -355,7 +355,7 @@ Demux_Test_Client::run_linear_test (CORBA::Environment &env)
 }
 
 int
-Demux_Test_Client::run_random_test (CORBA::Environment &)
+Demux_Test_Client::run_random_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Random test\n"));
@@ -363,7 +363,7 @@ Demux_Test_Client::run_random_test (CORBA::Environment &)
 }
 
 int
-Demux_Test_Client::run_best_test (CORBA::Environment &)
+Demux_Test_Client::run_best_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Best Test\n"));
@@ -371,7 +371,7 @@ Demux_Test_Client::run_best_test (CORBA::Environment &)
 }
 
 int
-Demux_Test_Client::run_worst_test (CORBA::Environment &)
+Demux_Test_Client::run_worst_test (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   ACE_DEBUG ((LM_DEBUG,
               "ERROR : Worst test\n"));
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.h b/TAO/performance-tests/POA/Demux/demux_test_client.h
index 767f28c1a60..a6ed4afce27 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.h
@@ -38,7 +38,7 @@ public:
     WORST
   };
 
-  typedef void (*OP_PTR) (Demux_Test_ptr, CORBA::Environment &);
+  typedef void (*OP_PTR) (Demux_Test_ptr TAO_ENV_ARG_DECL_NOT_USED);
 
   struct Operation_DB_Entry
   {
@@ -51,12 +51,10 @@ public:
   ~Demux_Test_Client (void);
   // DTOR
 
-  int init (int argc, char *argv [], CORBA::Environment &env
-            = CORBA::Environment::default_environment ());
+  int init (int argc, char *argv [] TAO_ENV_ARG_DECL_WITH_DEFAULTS);
   // initialize the client test bed
 
-  int run (CORBA::Environment &env
-           = CORBA::Environment::default_environment ());
+  int run (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run the tests
 
 private:
@@ -67,20 +65,16 @@ private:
   int init_operation_db (void);
   // initialize the operation database
 
-  int run_linear_test (CORBA::Environment &env
-                       = CORBA::Environment::default_environment ());
+  int run_linear_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run linear strategy
 
-  int run_random_test (CORBA::Environment &env
-                       = CORBA::Environment::default_environment ());
+  int run_random_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run random strategy
 
-  int run_best_test (CORBA::Environment &env
-                     = CORBA::Environment::default_environment ());
+  int run_best_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run best strategy (w.r.t to linear)
 
-  int run_worst_test (CORBA::Environment &env
-                      = CORBA::Environment::default_environment ());
+  int run_worst_test (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS);
   // run worst strategy (w.r.t to linear)
 
   int print_results (void);
@@ -121,9 +115,9 @@ private:
 
   CORBA::ULong step_;
   // Step for the no. of objects to be skipped while making remote calls
-  // on the given no. of objects. 
+  // on the given no. of objects.
   // If the step is 100, a call will be made to every 100th Object.
-  
+
   Operation_DB_Entry op_db_[TAO_DEMUX_TEST_MAX_OPS];
   // database of operations
 
diff --git a/TAO/performance-tests/POA/Demux/demux_test_client.i b/TAO/performance-tests/POA/Demux/demux_test_client.i
index e1788341625..9a113cb2f85 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_client.i
+++ b/TAO/performance-tests/POA/Demux/demux_test_client.i
@@ -1,14 +1,14 @@
 //$Id$
-static void M302 (Demux_Test_ptr objref, 
-                CORBA::Environment &env)
+static void M302 (Demux_Test_ptr objref
+                  TAO_ENV_ARG_DECL)
 {
-  objref->M302 (env);
+  objref->M302 (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
-static void shutdown (Demux_Test_ptr objref, 
-                CORBA::Environment &env)
+static void shutdown (Demux_Test_ptr objref
+                      TAO_ENV_ARG_DECL)
 {
-  objref->shutdown (env);
+  objref->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 int Demux_Test_Client::init_operation_db (void)
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.cpp b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
index b2bf2d2b63d..d20766f2711 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.cpp
@@ -12,12 +12,12 @@ Demux_Test_i::Demux_Test_i (void)
 Demux_Test_i::~Demux_Test_i (void)
 {}
 
-void Demux_Test_i::M302 (CORBA::Environment &)
+void Demux_Test_i::M302 (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
-void Demux_Test_i::shutdown (CORBA::Environment &)
+void Demux_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   TAO_ORB_Core_instance ()->orb ()->shutdown ();
diff --git a/TAO/performance-tests/POA/Demux/demux_test_i.h b/TAO/performance-tests/POA/Demux/demux_test_i.h
index c6860b5e7cd..ffa9d017ec2 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_i.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_i.h
@@ -24,15 +24,15 @@ public:
   // dtor
 
   // Return the Default POA of this Servant
-  PortableServer::POA_ptr _default_POA (CORBA::Environment &/*env*/)
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED/*env*/)
     {
       return PortableServer::POA::_duplicate (this->poa_.in ());
     };
 
-  virtual void M302 (CORBA::Environment &env)
+  virtual void M302 (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.cpp b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
index 821f2bd00e4..eeb3430c372 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.cpp
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.cpp
@@ -45,8 +45,8 @@ Demux_Test_Server::~Demux_Test_Server (void)
 //
 
 int
-Demux_Test_Server::init (int argc, char *argv [],
-                         CORBA::Environment &ACE_TRY_ENV)
+Demux_Test_Server::init (int argc, char *argv []
+                         TAO_ENV_ARG_DECL)
 {
   printf ("here\n");
 
@@ -58,7 +58,7 @@ Demux_Test_Server::init (int argc, char *argv [],
     {
       // get the underlying ORB
       this->orb_ =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GET_ORB);
     }
   ACE_CATCHANY
@@ -77,8 +77,8 @@ Demux_Test_Server::init (int argc, char *argv [],
       // Get the Root POA
 
       temp =
-        this->orb_->resolve_initial_references ("RootPOA",
-                                                ACE_TRY_ENV);
+        this->orb_->resolve_initial_references ("RootPOA"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX(GET_ROOT_POA);
       if (CORBA::is_nil (temp.in ()))
         ACE_ERROR_RETURN ((LM_ERROR,
@@ -86,8 +86,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                           1);
 
       this->root_poa_ =
-        PortableServer::POA::_narrow (temp.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (temp.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (GET_ROOT_POA);
     }
   ACE_CATCHANY
@@ -104,7 +104,7 @@ Demux_Test_Server::init (int argc, char *argv [],
     {
 
       this->poa_mgr_ =
-        this->root_poa_->the_POAManager (ACE_TRY_ENV);
+        this->root_poa_->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK_EX (GET_POA_MGR);
     }
   ACE_CATCHANY
@@ -146,8 +146,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                       "Using the USER_ID policy ... \n"));
 
           policies[0] =
-            this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID,
-                                                          ACE_TRY_ENV);
+            this->root_poa_->create_id_assignment_policy (PortableServer::USER_ID
+                                                          TAO_ENV_ARG_PARAMETER);
         }
       else
         {
@@ -155,8 +155,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                       "Using the SYSTEM_ID policy ... \n"));
 
           policies[0] =
-            this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID,
-                                                          ACE_TRY_ENV);
+            this->root_poa_->create_id_assignment_policy (PortableServer::SYSTEM_ID
+                                                          TAO_ENV_ARG_PARAMETER);
         }
 
       ACE_TRY_CHECK_EX (POLICY);
@@ -168,8 +168,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                       "Using the TRANSIENT Lifespan policy for the POAs\n"));
 
           policies[1] =
-            this->root_poa_->create_lifespan_policy (PortableServer::TRANSIENT,
-                                                     ACE_TRY_ENV);
+            this->root_poa_->create_lifespan_policy (PortableServer::TRANSIENT
+                                                     TAO_ENV_ARG_PARAMETER);
         }
       else
         {
@@ -177,8 +177,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                       "Using the PERSISTENT Lifespan policy for the POAs\n"));
 
           policies[1] =
-            this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT,
-                                                     ACE_TRY_ENV);
+            this->root_poa_->create_lifespan_policy (PortableServer::PERSISTENT
+                                                     TAO_ENV_ARG_PARAMETER);
         }
 
       ACE_TRY_CHECK_EX (POLICY);
@@ -229,8 +229,8 @@ Demux_Test_Server::init (int argc, char *argv [],
         {
           this->child_poa_[i] = prev_poa->create_POA (poa_name,
                                                       this->poa_mgr_.in (),
-                                                      policies,
-                                                      ACE_TRY_ENV);
+                                                      policies
+                                                      TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK_EX (CREATE_POA);
         }
       ACE_CATCHANY
@@ -257,8 +257,8 @@ Demux_Test_Server::init (int argc, char *argv [],
                                   -1);
 
                   //id = this->child_poa_[i]->activate_object (&this->demux_test_[j],
-                  id = this->child_poa_[i]->activate_object (demux_test_i_ptr,
-                                                             ACE_TRY_ENV);
+                  id = this->child_poa_[i]->activate_object (demux_test_i_ptr
+                                                             TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (ACTIVATE_OBJ);
                 }
               ACE_CATCHANY
@@ -273,12 +273,12 @@ Demux_Test_Server::init (int argc, char *argv [],
               // Get the IOR and output it to the file
               ACE_TRY_EX (IOR)
                 {
-                  CORBA::Object_var demux_var = this->child_poa_[i]->id_to_reference (id.in (),
-                                                                                      ACE_TRY_ENV);
+                  CORBA::Object_var demux_var = this->child_poa_[i]->id_to_reference (id.in ()
+                                                                                      TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK_EX (IOR);
 
                   CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in (), ACE_TRY_ENV);
+                    (demux_var.in () TAO_ENV_ARG_PARAMETER);
 
                   ACE_TRY_CHECK_EX (IOR);
 
@@ -318,17 +318,17 @@ Demux_Test_Server::init (int argc, char *argv [],
                     PortableServer::string_to_ObjectId (servant_name);
 
                   this->child_poa_[i]->activate_object_with_id (oid.in (),
-                                                                demux_test_i_ptr,
-                                                                ACE_TRY_ENV);
+                                                                demux_test_i_ptr
+                                                                TAO_ENV_ARG_PARAMETER);
                   ACE_TRY_CHECK;
 
                   // Get Object reference for demux_test_i impl object.
-                  CORBA::Object_var demux_var = demux_test_i_ptr->_this (ACE_TRY_ENV);
+                  CORBA::Object_var demux_var = demux_test_i_ptr->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 
                   ACE_TRY_CHECK;
 
                   CORBA::String_var ior = this->orb_->object_to_string
-                    (demux_var.in (), ACE_TRY_ENV);
+                    (demux_var.in () TAO_ENV_ARG_PARAMETER);
 
                   ACE_TRY_CHECK;
 
@@ -359,7 +359,7 @@ Demux_Test_Server::init (int argc, char *argv [],
 
   ACE_TRY_EX (ACTIVATE)
     {
-      this->poa_mgr_->activate (ACE_TRY_ENV);
+      this->poa_mgr_->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
 
       ACE_TRY_CHECK_EX (ACTIVATE);
     }
@@ -468,11 +468,11 @@ Demux_Test_Server::init_naming_service (void)
 
 // The main program for Demux_Test
 int
-Demux_Test_Server::run (CORBA::Environment &ACE_TRY_ENV)
+Demux_Test_Server::run (TAO_ENV_SINGLE_ARG_DECL)
 {
   ACE_TRY
     {
-      this->orb_->run (ACE_TRY_ENV);
+      this->orb_->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Demux/demux_test_server.h b/TAO/performance-tests/POA/Demux/demux_test_server.h
index 2fa321e1e00..b0cc927ed31 100644
--- a/TAO/performance-tests/POA/Demux/demux_test_server.h
+++ b/TAO/performance-tests/POA/Demux/demux_test_server.h
@@ -39,10 +39,10 @@ public:
   ~Demux_Test_Server (void);
   // dtor
 
-  int run (CORBA::Environment &);
+  int run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED);
   // Execute client code.
 
-  int init (int argc, char **argv, CORBA::Environment &);
+  int init (int argc, char **argv TAO_ENV_ARG_DECL_NOT_USED);
   // Initialize the communication endpoint with server.
 
   int calculate_avg_latency (void);
diff --git a/TAO/performance-tests/POA/Demux/server.cpp b/TAO/performance-tests/POA/Demux/server.cpp
index f8fd3773138..27014a37cff 100644
--- a/TAO/performance-tests/POA/Demux/server.cpp
+++ b/TAO/performance-tests/POA/Demux/server.cpp
@@ -34,13 +34,13 @@ int main (int argc, char *argv [])
   ACE_TRY_NEW_ENV
     {
       int r =
-        demux_test_server.init (argc, argv, ACE_TRY_ENV);
+        demux_test_server.init (argc, argv TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (r == -1)
         return -1;
 
-      demux_test_server.run (ACE_TRY_ENV);
+      demux_test_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCH (CORBA::SystemException, sysex)
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
index 4fcf47e544c..88490f1c62e 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.cpp
@@ -12,7 +12,7 @@ Factory::Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Simple_ptr
-Factory::create_simple_object (CORBA::Environment &ACE_TRY_ENV)
+Factory::create_simple_object (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Simple *simple_impl;
@@ -23,12 +23,12 @@ Factory::create_simple_object (CORBA::Environment &ACE_TRY_ENV)
 
   PortableServer::ServantBase_var owner_transfer(simple_impl);
 
-  return simple_impl->_this (ACE_TRY_ENV);
+  return simple_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Factory::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Factory.h b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
index 5683e18b1ed..69967f06580 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Factory.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Factory.h
@@ -26,10 +26,10 @@ public:
 
   // = The skeleton methods
 
-  virtual Test::Simple_ptr create_simple_object (CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Simple_ptr create_simple_object (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
index d5d76c835c4..6ff7ad5edb4 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.cpp
@@ -10,16 +10,16 @@ Simple::Simple (void)
 }
 
 void
-Simple::destroy (CORBA::Environment &ACE_TRY_ENV)
+Simple::destroy (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+  PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK;
 
   PortableServer::ObjectId_var oid =
-    poa->servant_to_id (this, ACE_TRY_ENV);
+    poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+  poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/Simple.h b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
index 4f3c7df8c5c..a0a6059ef09 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/Simple.h
+++ b/TAO/performance-tests/POA/Implicit_Activation/Simple.h
@@ -26,7 +26,7 @@ public:
 
   // = The skeleton 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/performance-tests/POA/Implicit_Activation/client.cpp b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
index 0f9a24b6ad3..e667ac7a147 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/client.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/client.cpp
@@ -80,18 +80,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Factory_var factory =
-        Test::Factory::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Factory::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (factory.in ()))
@@ -116,8 +116,8 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[i] = 
-            factory->create_simple_object (ACE_TRY_ENV);
+          references[i] =
+            factory->create_simple_object (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[j]->destroy (ACE_TRY_ENV);
+          references[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -160,7 +160,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          factory->shutdown (ACE_TRY_ENV);
+          factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
index 5a2d5ab1793..2a62b297e31 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/collocated.cpp
@@ -34,7 +34,7 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-i <niterations> "
+                           "-i <niterations> "
                            "-h "
                            "\n",
                            argv [0]),
@@ -72,11 +72,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -85,14 +85,14 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -118,8 +118,8 @@ main (int argc, char *argv[])
                           1);
           PortableServer::ServantBase_var owner_transfer(simple_impl);
 
-          references[i] = 
-            simple_impl->_this (ACE_TRY_ENV);
+          references[i] =
+            simple_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          references[j]->destroy (ACE_TRY_ENV);
+          references[j]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -160,10 +160,10 @@ main (int argc, char *argv[])
       destruction.collect_basic_stats (destruction_stats);
       destruction_stats.dump_results ("Destruction", gsf);
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Implicit_Activation/server.cpp b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
index 9ff3bc35c29..6d8fc18cd9c 100644
--- a/TAO/performance-tests/POA/Implicit_Activation/server.cpp
+++ b/TAO/performance-tests/POA/Implicit_Activation/server.cpp
@@ -18,14 +18,14 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
 
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -62,11 +62,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -75,11 +75,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -92,11 +92,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(factory_impl);
 
       Test::Factory_var factory =
-        factory_impl->_this (ACE_TRY_ENV);
+        factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (factory.in (), ACE_TRY_ENV);
+        orb->object_to_string (factory.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -109,18 +109,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
index fbd12fa1eb4..d6147cbaae3 100644
--- a/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
+++ b/TAO/performance-tests/POA/Object_Creation_And_Registration/registration.cpp
@@ -242,8 +242,8 @@ private:
 };
 
 void
-child_poa_testing (PortableServer::POA_ptr root_poa,
-                   CORBA::Environment &ACE_TRY_ENV)
+child_poa_testing (PortableServer::POA_ptr root_poa
+                   TAO_ENV_ARG_DECL)
 {
   // Policies for the child POA.
   CORBA::PolicyList policies (1);
@@ -251,16 +251,16 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
 
   // Id Assignment Policy
   policies[0] =
-    root_poa->create_id_assignment_policy (PortableServer::USER_ID,
-                                           ACE_TRY_ENV);
+    root_poa->create_id_assignment_policy (PortableServer::USER_ID
+                                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create the child POA under the RootPOA.
   PortableServer::POA_var child_poa =
     root_poa->create_POA ("child POA",
                           PortableServer::POAManager::_nil (),
-                          policies,
-                          ACE_TRY_ENV);
+                          policies
+                          TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
   // Create an array of servants
@@ -298,8 +298,8 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
 
         objects[i] =
           child_poa->create_reference_with_id (object_ids[i].in (),
-                                               "IDL:test:1.0",
-                                               ACE_TRY_ENV);
+                                               "IDL:test:1.0"
+                                               TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -313,8 +313,8 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
     for (i = 0; i < iterations; i++)
       {
         child_poa->activate_object_with_id (object_ids[i].in (),
-                                            &servants[i],
-                                            ACE_TRY_ENV);
+                                            &servants[i]
+                                            TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -327,8 +327,8 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
 
     for (i = 0; i < iterations; i++)
       {
-        child_poa->deactivate_object (object_ids[i].in (),
-                                      ACE_TRY_ENV);
+        child_poa->deactivate_object (object_ids[i].in ()
+                                      TAO_ENV_ARG_PARAMETER);
         ACE_CHECK;
       }
   }
@@ -342,15 +342,15 @@ child_poa_testing (PortableServer::POA_ptr root_poa,
 int
 main (int argc, char **argv)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       // Initialize the ORB first.
       CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                             argv,
-                                            0,
-                                            ACE_TRY_ENV);
+                                            0
+                                            TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result = parse_args (argc, argv);
@@ -358,14 +358,14 @@ main (int argc, char **argv)
         return result;
 
       // Obtain the RootPOA.
-      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA",
-                                                               ACE_TRY_ENV);
+      CORBA::Object_var obj = orb->resolve_initial_references ("RootPOA"
+                                                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the POA_var object from Object_var.
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Create an array of servants
@@ -395,7 +395,7 @@ main (int argc, char **argv)
 
         for (i = 0; i < iterations; i++)
           {
-            objects[i] = servants[i]._this (ACE_TRY_ENV);
+            objects[i] = servants[i]._this (TAO_ENV_SINGLE_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
@@ -407,21 +407,21 @@ main (int argc, char **argv)
 
         for (i = 0; i < iterations; i++)
           {
-            object_ids[i] = root_poa->servant_to_id (&servants[i],
-                                                     ACE_TRY_ENV);
+            object_ids[i] = root_poa->servant_to_id (&servants[i]
+                                                     TAO_ENV_ARG_PARAMETER);
             ACE_TRY_CHECK;
           }
       }
 
       // Create the child POA.
-      child_poa_testing (root_poa.in (),
-                         ACE_TRY_ENV);
+      child_poa_testing (root_poa.in ()
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Destroy RootPOA.
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Cleanup
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
index 9b504d6fff5..cffa1ac71c4 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Client.cpp
@@ -165,12 +165,12 @@ PP_Test_Client::parse_args (void)
 void
 PP_Test_Client::send_oneway (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_ONEWAY_START);
-      this->objref_->send_oneway (ACE_TRY_ENV);
+      this->objref_->send_oneway (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -190,12 +190,12 @@ PP_Test_Client::send_oneway (void)
 void
 PP_Test_Client::send_void (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SEND_VOID_START);
-      this->objref_->send_void (ACE_TRY_ENV);
+      this->objref_->send_void (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       this->call_count_++;
     }
@@ -259,7 +259,7 @@ PP_Test_Client::run ()
 int
 PP_Test_Client::shutdown_server (int do_shutdown)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -268,7 +268,7 @@ PP_Test_Client::shutdown_server (int do_shutdown)
           ACE_DEBUG ((LM_DEBUG,
                       "shutdown on Pluggable_Test object\n"));
 
-          this->objref_->shutdown (ACE_TRY_ENV);
+          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
 
           ACE_TRY_CHECK;
 
@@ -290,7 +290,7 @@ PP_Test_Client::shutdown_server (int do_shutdown)
 int
 PP_Test_Client::run_oneway (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -312,7 +312,7 @@ PP_Test_Client::run_oneway (void)
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
 
-          this->objref_->shutdown (ACE_TRY_ENV);
+          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -333,7 +333,7 @@ PP_Test_Client::run_oneway (void)
 int
 PP_Test_Client::run_void (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
@@ -355,7 +355,7 @@ PP_Test_Client::run_void (void)
 
           ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_SERVER_SHUTDOWN_START);
 
-          this->objref_->shutdown (ACE_TRY_ENV);
+          this->objref_->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_DEBUG ((LM_DEBUG,
@@ -403,8 +403,8 @@ PP_Test_Client::init (int argc, char **argv)
       // Retrieve the ORB.
       this->orb_ = CORBA::ORB_init (this->argc_,
                                     this->argv_,
-                                    "internet",
-                                    ACE_TRY_ENV);
+                                    "internet"
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
       // Parse command line and verify parameters.
       if (this->parse_args () == -1)
@@ -421,13 +421,13 @@ PP_Test_Client::init (int argc, char **argv)
         }
 
       CORBA::Object_var factory_object =
-        this->orb_->string_to_object (this->factory_key_,
-                                      ACE_TRY_ENV);
+        this->orb_->string_to_object (this->factory_key_
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       this->factory_ =
-        Pluggable_Test_Factory::_narrow (factory_object.in(),
-                                ACE_TRY_ENV);
+        Pluggable_Test_Factory::_narrow (factory_object.in()
+                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->factory_.in ()))
@@ -444,7 +444,7 @@ PP_Test_Client::init (int argc, char **argv)
       // Now retrieve the Pluggable_Test obj ref corresponding to the key.
       ACE_FUNCTION_TIMEPROBE (PP_TEST_CLIENT_MAKE_PLUGGABLE_START);
 
-      this->objref_ = this->factory_->make_pluggable_test (ACE_TRY_ENV);
+      this->objref_ = this->factory_->make_pluggable_test (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (this->objref_.in ()))
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
index 8f91dae07e7..6b223de0f87 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.cpp
@@ -48,15 +48,15 @@ PP_Test_Server::parse_args (void)
 
 int
 PP_Test_Server::init (int argc,
-                      char** argv,
-                      CORBA::Environment& ACE_TRY_ENV)
+                      char** argv
+                      TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
 {
   // Call the init of <TAO_ORB_Manager> to initialize the ORB and
   // create a child POA under the root POA.
   if (this->orb_manager_.init_child_poa (argc,
                                          argv,
-                                         "child_poa",
-                                         ACE_TRY_ENV) == -1)
+                                         "child_poa"
+                                         TAO_ENV_ARG_PARAMETER) == -1)
     ACE_ERROR_RETURN ((LM_ERROR,
                        "%p\n",
                        "init_child_poa"),
@@ -78,8 +78,8 @@ PP_Test_Server::init (int argc,
 
   this->factory_id_ =
     this->orb_manager_.activate_under_child_poa ("factory",
-                                                 this->factory_impl_,
-                                                 ACE_TRY_ENV);
+                                                 this->factory_impl_
+                                                 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   ACE_DEBUG ((LM_DEBUG,
@@ -99,9 +99,9 @@ PP_Test_Server::init (int argc,
 }
 
 int
-PP_Test_Server::run (CORBA::Environment& ACE_TRY_ENV)
+PP_Test_Server::run (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
 {
-  int result = this->orb_manager_.run (ACE_TRY_ENV);
+  int result = this->orb_manager_.run (TAO_ENV_SINGLE_ARG_PARAMETER);
 
   ACE_CHECK_RETURN (-1);
 
diff --git a/TAO/performance-tests/Pluggable/PP_Test_Server.h b/TAO/performance-tests/Pluggable/PP_Test_Server.h
index 31aea34bb9f..4be6dcaf311 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_Server.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_Server.h
@@ -49,11 +49,11 @@ public:
   // Destructor
 
   int init (int argc,
-            char **argv,
-            CORBA::Environment& env);
+            char **argv
+            TAO_ENV_ARG_DECL);
   // Initialize the server state - parsing arguments, etc.
 
-  int run (CORBA::Environment& env);
+  int run (TAO_ENV_SINGLE_ARG_DECL);
   // Run the orb
 
 private:
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.cpp b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
index b1127f11a31..25664e6986d 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.cpp
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.cpp
@@ -72,11 +72,11 @@ Pluggable_Test_Factory_i::~Pluggable_Test_Factory_i (void)
 }
 
 Pluggable_Test_ptr
-Pluggable_Test_Factory_i::make_pluggable_test (CORBA::Environment &env)
+Pluggable_Test_Factory_i::make_pluggable_test (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_MAKE_PLUGGABLE_START);
-  return my_pluggable_test_._this (env);
+  return my_pluggable_test_._this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 // Constructor
@@ -95,7 +95,7 @@ PP_Test_i::~PP_Test_i (void)
 // Oneway send
 
 void
-PP_Test_i::send_oneway (CORBA::Environment &)
+PP_Test_i::send_oneway (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_ONEWAY_START);
@@ -104,7 +104,7 @@ PP_Test_i::send_oneway (CORBA::Environment &)
 // Twoway send
 
 void
-PP_Test_i::send_void (CORBA::Environment &)
+PP_Test_i::send_void (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_FUNCTION_TIMEPROBE (PP_TEST_I_SEND_VOID_START);
@@ -112,7 +112,7 @@ PP_Test_i::send_void (CORBA::Environment &)
 
 // Shutdown.
 
-void PP_Test_i::shutdown (CORBA::Environment &)
+void PP_Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_DEBUG ((LM_DEBUG,
diff --git a/TAO/performance-tests/Pluggable/PP_Test_i.h b/TAO/performance-tests/Pluggable/PP_Test_i.h
index 7950a0fb248..2c439e97528 100644
--- a/TAO/performance-tests/Pluggable/PP_Test_i.h
+++ b/TAO/performance-tests/Pluggable/PP_Test_i.h
@@ -34,15 +34,15 @@ public:
   ~PP_Test_i (void);
   // Destructor
 
-  virtual void send_oneway (CORBA::Environment &env)
+  virtual void send_oneway (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a oneway call.
 
-  virtual void send_void (CORBA::Environment &env)
+  virtual void send_void (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Test a twoway call.
 
-  virtual void shutdown (CORBA::Environment &env)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Shutdown routine.
 
@@ -65,7 +65,7 @@ public:
   ~Pluggable_Test_Factory_i (void);
   // Destructor.
 
-  virtual Pluggable_Test_ptr make_pluggable_test (CORBA::Environment &env)
+  virtual Pluggable_Test_ptr make_pluggable_test (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
   // Make a Pluggable Test object.
 
diff --git a/TAO/performance-tests/Pluggable/server.cpp b/TAO/performance-tests/Pluggable/server.cpp
index 657fce2b66d..99b513899e8 100644
--- a/TAO/performance-tests/Pluggable/server.cpp
+++ b/TAO/performance-tests/Pluggable/server.cpp
@@ -15,13 +15,13 @@ main (int argc, char *argv[])
   ACE_DEBUG ((LM_DEBUG,
               "\n\tPluggable_Test: server\n\n"));
 
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
 
   ACE_TRY
     {
       int status = pp_test_server.init (argc,
-                                        argv,
-                                        ACE_TRY_ENV);
+                                        argv
+                                        TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (status == -1)
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
         }
       else
         {
-          pp_test_server.run (ACE_TRY_ENV);
+          pp_test_server.run (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
index c2aff04156b..3c40536d884 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.cpp
@@ -11,8 +11,8 @@
 ACE_RCSID(Latency, test_i, "$Id$")
 
 void
-Test_i::test_method (CORBA::Long id,
-                     CORBA::Environment&)
+Test_i::test_method (CORBA::Long id
+                     TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -22,17 +22,17 @@ Test_i::test_method (CORBA::Long id,
 }
 
 void
-Test_i::shutdown (const char *orb_id,
-                  CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (const char *orb_id
+                  TAO_ENV_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   int argc = 0;
   CORBA::ORB_var orb = CORBA::ORB_init (argc,
                                         0,
-                                        orb_id,
-                                        ACE_TRY_ENV);
+                                        orb_id
+                                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 
-  orb->shutdown (0, ACE_TRY_ENV);
+  orb->shutdown (0 TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
index b7bef2f7279..a3d93fa6f2d 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Common/test_i.h
@@ -31,12 +31,12 @@ public:
   // ctor
 
   // = The Test methods.
-  void test_method (CORBA::Long id,
-                    CORBA::Environment&)
+  void test_method (CORBA::Long id
+                    TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (const char *orb_id,
-                 CORBA::Environment&)
+  void shutdown (const char *orb_id
+                 TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 };
 
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
index cced0e943f0..fc251f64bd0 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/client.cpp
@@ -141,7 +141,7 @@ main (int argc, char *argv[])
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -149,13 +149,13 @@ main (int argc, char *argv[])
 
       // Obtain Priority Mapping used by the ORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PriorityMappingManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("PriorityMappingManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                              ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mapping_manager.in ()))
@@ -260,11 +260,11 @@ Client::svc (void)
                        priorities[this->id_]);
 
       CORBA::Object_var object =
-        orb_->string_to_object (ior, ACE_TRY_ENV);
+        orb_->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -281,12 +281,12 @@ Client::svc (void)
       for (int j = 0; j < 100; ++j)
         {
           /* CORBA::PolicyList_var pols;
-          server->_validate_connection (pols.out (),
-                                        ACE_TRY_ENV);
+          server->_validate_connection (pols.out ()
+                                        TAO_ENV_ARG_PARAMETER);
           */
 
-          server->test_method (this->id_,
-                               ACE_TRY_ENV);
+          server->test_method (this->id_
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -300,8 +300,8 @@ Client::svc (void)
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
           // Invoke method.
-          server->test_method (this->id_,
-                               ACE_TRY_ENV);
+          server->test_method (this->id_
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Grab timestamp again.
@@ -320,7 +320,7 @@ Client::svc (void)
 
       /* char orb_name[50];
       ACE_OS::sprintf (orb_name, "%d", priorities[this->id_]);
-      server->shutdown (orb_name, ACE_TRY_ENV);
+      server->shutdown (orb_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;*/
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
index c1349e95874..37c900601af 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Orb_Per_Priority/server.cpp
@@ -120,7 +120,7 @@ main (int argc, char *argv[])
       int argc_ = argc;
       for (int i = 0; i < argc; ++i)
         argv_[i] = argv[i];
-      orb = CORBA::ORB_init (argc_, argv_, "", ACE_TRY_ENV);
+      orb = CORBA::ORB_init (argc_, argv_, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Parse the arguments.
@@ -129,13 +129,13 @@ main (int argc, char *argv[])
 
       // Obtain Priority Mapping used by the ORB.
       CORBA::Object_var object =
-        orb->resolve_initial_references ("PriorityMappingManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("PriorityMappingManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                              ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mapping_manager.in ()))
@@ -150,7 +150,7 @@ main (int argc, char *argv[])
   ACE_CATCHANY
     {
       ACE_PRINT_EXCEPTION (ACE_ANY_EXCEPTION,
-                           "Catched exception in Orb per priority server:");
+                           "Caught exception in Orb per priority server:");
       return 1;
     }
   ACE_ENDTRY;
@@ -214,11 +214,11 @@ Server::svc (void)
       char orb_name[64];
       ACE_OS::sprintf (orb_name, "%d", this->priority_);
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc_, argv_, orb_name, ACE_TRY_ENV);
+        CORBA::ORB_init (argc_, argv_, orb_name TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -227,23 +227,23 @@ Server::svc (void)
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::ObjectId_var oid =
-        root_poa->activate_object (this->server_, ACE_TRY_ENV);
+        root_poa->activate_object (this->server_ TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var obj =
-        root_poa->id_to_reference (oid.in (), ACE_TRY_ENV);
+        root_poa->id_to_reference (oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (obj.in (), ACE_TRY_ENV);
+        orb->object_to_string (obj.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -266,10 +266,10 @@ Server::svc (void)
       ACE_OS::fclose (output_file);
 
       // Start orb event loop.
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
index 789d5bf9e11..87606c83135 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/client.cpp
@@ -141,18 +141,18 @@ main (int argc, char *argv[])
       ACE_UINT32 gsf = ACE_High_Res_Timer::global_scale_factor ();
 
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_var server =
-        Test::_narrow (object.in (), ACE_TRY_ENV);
+        Test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (server.in ()))
@@ -164,13 +164,13 @@ main (int argc, char *argv[])
         }
 
       // Obtain Priority Mapping used by the ORB.
-      object = orb->resolve_initial_references ("PriorityMappingManager",
-                                                ACE_TRY_ENV);
+      object = orb->resolve_initial_references ("PriorityMappingManager"
+                                                TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                              ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (mapping_manager.in ()))
@@ -222,7 +222,7 @@ main (int argc, char *argv[])
         }
       throughput.dump_results ("Aggregated", gsf);
 
-      server->shutdown ("", ACE_TRY_ENV);
+      server->shutdown ("" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
     }
@@ -285,12 +285,12 @@ Client::svc (void)
       for (int j = 0; j < 100; ++j)
         {
           /*    CORBA::PolicyList_var pols;
-          server_->_validate_connection (pols.out (),
-                                         ACE_TRY_ENV);
+          server_->_validate_connection (pols.out ()
+                                         TAO_ENV_ARG_PARAMETER);
           */
 
-          server_->test_method (this->id_,
-                                ACE_TRY_ENV);
+          server_->test_method (this->id_
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -304,8 +304,8 @@ Client::svc (void)
           ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 
           // Invoke method.
-          server_->test_method (this->id_,
-                                ACE_TRY_ENV);
+          server_->test_method (this->id_
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Grab timestamp again.
diff --git a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
index e54dc4d81bf..6c42cd630b2 100644
--- a/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
+++ b/TAO/performance-tests/RTCorba/Multiple_Endpoints/Single_Endpoint/server.cpp
@@ -59,11 +59,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -72,11 +72,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -85,11 +85,11 @@ main (int argc, char *argv[])
       Test_i server_impl;
 
       Test_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (), ACE_TRY_ENV);
+        orb->object_to_string (server.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Activated as <%s>\n", ior.in ()));
@@ -107,10 +107,10 @@ main (int argc, char *argv[])
           ACE_OS::fclose (output_file);
         }
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
index d107eaba1e4..34c30b41cca 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/client.cpp
@@ -9,7 +9,10 @@
 #include "ace/Stats.h"
 #include "ace/High_Res_Timer.h"
 
-ACE_RCSID(Reliable, client, "$Id$")
+ACE_RCSID (Reliable,
+           client,
+           "$Id$")
+
 
 #define USING_TIMERS
 //#define USING_QUANTIFY
@@ -131,8 +134,8 @@ print_params (void)
 }
 
 static void
-twoway_work_test (Test_ptr server,
-                  CORBA::Environment &ACE_TRY_ENV)
+twoway_work_test (Test_ptr server
+                  TAO_ENV_ARG_DECL)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -152,8 +155,8 @@ twoway_work_test (Test_ptr server,
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->twoway_work_test (work,
-                                ACE_TRY_ENV);
+      server->twoway_work_test (work
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 #if defined (USING_TIMERS)
@@ -176,8 +179,8 @@ twoway_work_test (Test_ptr server,
 }
 
 static void
-oneway_work_test (Test_ptr server,
-                  CORBA::Environment &ACE_TRY_ENV)
+oneway_work_test (Test_ptr server
+                  TAO_ENV_ARG_DECL)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -197,8 +200,8 @@ oneway_work_test (Test_ptr server,
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->oneway_work_test (work,
-                                ACE_TRY_ENV);
+      server->oneway_work_test (work
+                                TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 #if defined (USING_TIMERS)
@@ -221,8 +224,8 @@ oneway_work_test (Test_ptr server,
 }
 
 static void
-oneway_payload_test (Test_ptr server,
-                     CORBA::Environment &ACE_TRY_ENV)
+oneway_payload_test (Test_ptr server
+                     TAO_ENV_ARG_DECL)
 {
 #if defined (USING_TIMERS)
   ACE_Throughput_Stats latency;
@@ -245,8 +248,8 @@ oneway_payload_test (Test_ptr server,
       ACE_hrtime_t latency_base = ACE_OS::gethrtime ();
 #endif /* USING_TIMERS */
 
-      server->oneway_payload_test (the_data,
-                                   ACE_TRY_ENV);
+      server->oneway_payload_test (the_data
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
 
 #if defined (USING_TIMERS)
@@ -428,8 +431,8 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the command line options.
@@ -441,31 +444,31 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var obj =
-        orb->resolve_initial_references ("ORBPolicyManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("ORBPolicyManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyManager_var policy_manager =
-        CORBA::PolicyManager::_narrow (obj.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyManager::_narrow (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      obj = orb->resolve_initial_references ("PolicyCurrent",
-                                             ACE_TRY_ENV);
+      obj = orb->resolve_initial_references ("PolicyCurrent"
+                                             TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::PolicyCurrent_var policy_current =
-        CORBA::PolicyCurrent::_narrow (obj.in (),
-                                       ACE_TRY_ENV);
+        CORBA::PolicyCurrent::_narrow (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
 
       ACE_TRY_CHECK;
 
-      obj = orb->string_to_object (ior,
-                                   ACE_TRY_ENV);
+      obj = orb->string_to_object (ior
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      Test_var server = Test::_narrow (obj.in (),
-                                       ACE_TRY_ENV);
+      Test_var server = Test::_narrow (obj.in ()
+                                       TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Print testing parameters.
@@ -474,8 +477,8 @@ main (int argc, char *argv[])
       // Run the test.
       if (test_twoway)
         {
-          twoway_work_test (server.in (),
-                            ACE_TRY_ENV);
+          twoway_work_test (server.in ()
+                            TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else
@@ -491,8 +494,8 @@ main (int argc, char *argv[])
           // Set up the sync scope policy.
           sync_scope_policy_list[0] =
             orb->create_policy (Messaging::SYNC_SCOPE_POLICY_TYPE,
-                                sync_scope_any,
-                                ACE_TRY_ENV);
+                                sync_scope_any
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           switch (level)
@@ -500,29 +503,29 @@ main (int argc, char *argv[])
             case ORB_LEVEL:
               // Set the sync scope policy at the ORB level.
               policy_manager->set_policy_overrides (sync_scope_policy_list,
-                                                    CORBA::ADD_OVERRIDE,
-                                                    ACE_TRY_ENV);
+                                                    CORBA::ADD_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
 
             case THREAD_LEVEL:
               // Set the sync scope policy at the thread level.
               policy_current->set_policy_overrides (sync_scope_policy_list,
-                                                    CORBA::ADD_OVERRIDE,
-                                                    ACE_TRY_ENV);
+                                                    CORBA::ADD_OVERRIDE
+                                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
 
             case OBJECT_LEVEL:
               // Set the sync scope policy at the object level.
               obj = server->_set_policy_overrides (sync_scope_policy_list,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Get the new object reference with the updated policy.
-              server = Test::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+              server = Test::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
               break;
 
@@ -531,7 +534,7 @@ main (int argc, char *argv[])
           }
 
           // We are done with this policy.
-          sync_scope_policy_list[0]->destroy (ACE_TRY_ENV);
+          sync_scope_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           // Are we buffering the oneway requests?
@@ -554,33 +557,33 @@ main (int argc, char *argv[])
               // Set up the buffering constraint policy.
               buffering_constraint_policy_list[0] =
                 orb->create_policy (TAO::BUFFERING_CONSTRAINT_POLICY_TYPE,
-                                    buffering_constraint_any,
-                                    ACE_TRY_ENV);
+                                    buffering_constraint_any
+                                    TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Set up the constraints (at the object level).
               obj = server->_set_policy_overrides (buffering_constraint_policy_list,
-                                                   CORBA::ADD_OVERRIDE,
-                                                   ACE_TRY_ENV);
+                                                   CORBA::ADD_OVERRIDE
+                                                   TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // We are done with this policy.
-              buffering_constraint_policy_list[0]->destroy (ACE_TRY_ENV);
+              buffering_constraint_policy_list[0]->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
               ACE_TRY_CHECK;
 
               // Get the new object reference with the updated policy.
-              server = Test::_narrow (obj.in (),
-                                      ACE_TRY_ENV);
+              server = Test::_narrow (obj.in ()
+                                      TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
           // Run the oneway test.
           if (payload_test)
-            oneway_payload_test (server.in (),
-                                 ACE_TRY_ENV);
+            oneway_payload_test (server.in ()
+                                 TAO_ENV_ARG_PARAMETER);
           else
-            oneway_work_test (server.in (),
-                              ACE_TRY_ENV);
+            oneway_work_test (server.in ()
+                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -589,7 +592,7 @@ main (int argc, char *argv[])
           ACE_DEBUG ((LM_DEBUG,
                       "\nShutting down server\n"));
 
-          server->shutdown (ACE_TRY_ENV);
+          server->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -599,7 +602,7 @@ main (int argc, char *argv[])
       // static destructors to flush the queues, it will be too late.
       // Therefore, we use explicit destruction here and flush the
       // queues before main() ends.
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
index d6600543687..6e6af098253 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/server.cpp
@@ -59,8 +59,8 @@ set_rt_mode (void)
         }
       else
         ACE_ERROR ((LM_ERROR,
-		    "client (%P|%t): sched_params failed %p\n",
-		    "set_rt_mode"));
+                    "client (%P|%t): sched_params failed %p\n",
+                    "set_rt_mode"));
     }
 
   // Get our thread handle.
@@ -70,8 +70,8 @@ set_rt_mode (void)
   // Set our thread priority.
   if (ACE_OS::thr_setprio (self, priority) != 0)
     ACE_ERROR ((LM_ERROR,
-		"server (%P|%t):thr_setprio failed %p\n",
-		"set_rt_mode"));
+                "server (%P|%t):thr_setprio failed %p\n",
+                "set_rt_mode"));
 
   // Do a sanity check.
   if (ACE_OS::thr_getprio (self, priority) == 0)
@@ -94,8 +94,8 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // Get the command line options.
@@ -107,28 +107,28 @@ main (int argc, char *argv[])
         }
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test_i server_impl (orb.in ());
 
       Test_var server =
-        server_impl._this (ACE_TRY_ENV);
+        server_impl._this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (server.in (),
-                               ACE_TRY_ENV);
+        orb->object_to_string (server.in ()
+                               TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG,
@@ -149,17 +149,17 @@ main (int argc, char *argv[])
 
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "event loop finished\n"));
 
       root_poa->destroy (1,
-                         1,
-                         ACE_TRY_ENV);
+                         1
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
index 7b768d0ea90..17c0cfa9726 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.cpp
@@ -10,8 +10,8 @@ ACE_RCSID(Reliable, test_i, "$Id$")
 #endif /* __ACE_INLINE__ */
 
 void
-Test_i::oneway_work_test (CORBA::ULong work,
-                          CORBA::Environment &)
+Test_i::oneway_work_test (CORBA::ULong work
+                          TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
@@ -24,15 +24,15 @@ Test_i::oneway_work_test (CORBA::ULong work,
 }
 
 void
-Test_i::oneway_payload_test (const Test::data &,
-                             CORBA::Environment &)
+Test_i::oneway_payload_test (const Test::data &
+                             TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
 }
 
 void
-Test_i::twoway_work_test (CORBA::ULong work,
-                          CORBA::Environment &)
+Test_i::twoway_work_test (CORBA::ULong work
+                          TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   for (CORBA::ULong i = 0; i < work; i++)
@@ -45,9 +45,9 @@ Test_i::twoway_work_test (CORBA::ULong work,
 }
 
 void
-Test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+Test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED TAO_ENV_SINGLE_ARG_PARAMETER)
     ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
index ee52b2c8d3f..2ef26b8c187 100644
--- a/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
+++ b/TAO/performance-tests/RTCorba/Oneways/Reliable/test_i.h
@@ -31,23 +31,19 @@ public:
   // ctor
 
   // = The Test methods.
-  void oneway_payload_test (const Test::data &d,
-                            CORBA::Environment &ACE_TRY_ENV =
-                            TAO_default_environment ())
+  void oneway_payload_test (const Test::data &d
+                            TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void oneway_work_test (CORBA::ULong work,
-                         CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+  void oneway_work_test (CORBA::ULong work
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void twoway_work_test (CORBA::ULong work,
-                         CORBA::Environment &ACE_TRY_ENV =
-                         TAO_default_environment ())
+  void twoway_work_test (CORBA::ULong work
+                         TAO_ENV_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &ACE_TRY_ENV =
-                   TAO_default_environment ())
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_WITH_DEFAULTS)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
index 6e0264cf576..abd88699003 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/client.cpp
@@ -244,14 +244,14 @@ start_synchronization (test_ptr test,
   ACE_TRY_NEW_ENV
     {
       for (CORBA::ULong i = 0;
-	   i < synchronization_iterations;
-	   ++i)
-	{
-	  test->method (work,
-			prime_number,
-			ACE_TRY_ENV);
-	  ACE_TRY_CHECK;
-	}
+           i < synchronization_iterations;
+           ++i)
+        {
+          test->method (work,
+                        prime_number
+                        TAO_ENV_ARG_PARAMETER);
+          ACE_TRY_CHECK;
+        }
     }
   ACE_CATCHANY
     {
@@ -358,7 +358,7 @@ max_throughput (test_ptr test,
   ACE_TRY_NEW_ENV
     {
       CORBA_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Boolean result =
@@ -386,8 +386,8 @@ max_throughput (test_ptr test,
             break;
 
           test->method (work,
-                        prime_number,
-                        ACE_TRY_ENV);
+                        prime_number
+                        TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ++calls_made;
@@ -430,9 +430,9 @@ public:
 
   int svc (void);
   ACE_hrtime_t deadline_for_current_call (CORBA::ULong i);
-  void reset_priority (CORBA::Environment &ACE_TRY_ENV);
+  void reset_priority (TAO_ENV_SINGLE_ARG_DECL);
   void print_stats (ACE_hrtime_t test_end);
-  int setup (CORBA::Environment &ACE_TRY_ENV);
+  int setup (TAO_ENV_SINGLE_ARG_DECL);
   void missed_start_deadline (CORBA::ULong invocation);
   void missed_end_deadline (CORBA::ULong invocation);
 
@@ -483,18 +483,18 @@ Paced_Worker::Paced_Worker (ACE_Thread_Manager &thread_manager,
 }
 
 void
-Paced_Worker::reset_priority (CORBA::Environment &ACE_TRY_ENV)
+Paced_Worker::reset_priority (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (set_priority)
     {
-      this->current_->the_priority (this->priority_,
-                                    ACE_TRY_ENV);
+      this->current_->the_priority (this->priority_
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
   else
     {
-      this->current_->the_priority (continuous_worker_priority,
-                                    ACE_TRY_ENV);
+      this->current_->the_priority (continuous_worker_priority
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK;
     }
 }
@@ -600,16 +600,16 @@ Paced_Worker::print_stats (ACE_hrtime_t test_end)
 }
 
 int
-Paced_Worker::setup (CORBA::Environment &ACE_TRY_ENV)
+Paced_Worker::setup (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
-      this->reset_priority (ACE_TRY_ENV);
+      this->reset_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
   this->CORBA_priority_ =
-    this->current_->the_priority (ACE_TRY_ENV);
+    this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Boolean result =
@@ -647,7 +647,7 @@ Paced_Worker::svc (void)
   ACE_TRY_NEW_ENV
     {
       int result =
-        this->setup (ACE_TRY_ENV);
+        this->setup (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -670,8 +670,8 @@ Paced_Worker::svc (void)
             }
 
           this->test_->method (work,
-                               prime_number,
-                               ACE_TRY_ENV);
+                               prime_number
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t time_after_call =
@@ -725,7 +725,7 @@ public:
   int svc (void);
   void print_stats (ACE_Sample_History &history,
                     ACE_hrtime_t test_end);
-  int setup (CORBA::Environment &ACE_TRY_ENV);
+  int setup (TAO_ENV_SINGLE_ARG_DECL);
   void print_collective_stats (void);
 
   test_var test_;
@@ -827,17 +827,17 @@ Continuous_Worker::print_collective_stats (void)
 }
 
 int
-Continuous_Worker::setup (CORBA::Environment &ACE_TRY_ENV)
+Continuous_Worker::setup (TAO_ENV_SINGLE_ARG_DECL)
 {
   if (priority_setting == AFTER_THREAD_CREATION)
     {
-      this->current_->the_priority (continuous_worker_priority,
-                                    ACE_TRY_ENV);
+      this->current_->the_priority (continuous_worker_priority
+                                    TAO_ENV_ARG_PARAMETER);
       ACE_CHECK_RETURN (-1);
     }
 
   this->CORBA_priority_ =
-    this->current_->the_priority (ACE_TRY_ENV);
+    this->current_->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   CORBA::Boolean result =
@@ -862,7 +862,7 @@ Continuous_Worker::svc (void)
       ACE_Sample_History history (this->iterations_);
 
       int result =
-        this->setup (ACE_TRY_ENV);
+        this->setup (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
@@ -875,8 +875,8 @@ Continuous_Worker::svc (void)
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
           this->test_->method (work,
-                               prime_number,
-                               ACE_TRY_ENV);
+                               prime_number
+                               TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t end = ACE_OS::gethrtime ();
@@ -911,7 +911,7 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -922,31 +922,31 @@ main (int argc, char *argv[])
       fudge_priorities (orb.in ());
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_var test =
-        test::_narrow (object.in (), ACE_TRY_ENV);
+        test::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("PriorityMappingManager",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("PriorityMappingManager"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMappingManager_var mapping_manager =
-        RTCORBA::PriorityMappingManager::_narrow (object.in (),
-                                                  ACE_TRY_ENV);
+        RTCORBA::PriorityMappingManager::_narrow (object.in ()
+                                                  TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::PriorityMapping &priority_mapping =
@@ -1145,7 +1145,7 @@ main (int argc, char *argv[])
 
       if (shutdown_server)
         {
-          test->shutdown (ACE_TRY_ENV);
+          test->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
index 1789a23b11f..10950362126 100644
--- a/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
+++ b/TAO/performance-tests/RTCorba/Thread_Pool/server.cpp
@@ -21,14 +21,14 @@ public:
           PortableServer::POA_ptr poa);
 
   void method (CORBA::ULong work,
-               CORBA::ULong prime_number,
-               CORBA::Environment &)
+               CORBA::ULong prime_number
+               TAO_ENV_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  void shutdown (CORBA::Environment &)
+  void shutdown (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  PortableServer::POA_ptr _default_POA (CORBA_Environment &ACE_TRY_ENV);
+  PortableServer::POA_ptr _default_POA (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   CORBA::ORB_var orb_;
@@ -44,8 +44,8 @@ test_i::test_i (CORBA::ORB_ptr orb,
 
 void
 test_i::method (CORBA::ULong work,
-                CORBA::ULong prime_number,
-                CORBA::Environment &)
+                CORBA::ULong prime_number
+                TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (TAO_debug_level > 0)
@@ -60,17 +60,17 @@ test_i::method (CORBA::ULong work,
 }
 
 PortableServer::POA_ptr
-test_i::_default_POA (CORBA_Environment &)
+test_i::_default_POA (TAO_ENV_SINGLE_ARG_DECL_NOT_USED)
 {
   return PortableServer::POA::_duplicate (this->poa_.in ());
 }
 
 void
-test_i::shutdown (CORBA::Environment& ACE_TRY_ENV)
+test_i::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0,
-                        ACE_TRY_ENV);
+  this->orb_->shutdown (0
+                        TAO_ENV_ARG_PARAMETER);
   ACE_CHECK;
 }
 
@@ -169,12 +169,12 @@ parse_args (int argc, char *argv[])
 int
 write_ior_to_file (const char *ior_file,
                    CORBA::ORB_ptr orb,
-                   CORBA::Object_ptr object,
-                   CORBA_Environment &ACE_TRY_ENV)
+                   CORBA::Object_ptr object
+                   TAO_ENV_ARG_DECL)
 {
   CORBA::String_var ior =
-    orb->object_to_string (object,
-                           ACE_TRY_ENV);
+    orb->object_to_string (object
+                           TAO_ENV_ARG_PARAMETER);
   ACE_CHECK_RETURN (-1);
 
   FILE *output_file =
@@ -204,48 +204,48 @@ main (int argc, char *argv[])
       CORBA::ORB_var orb =
         CORBA::ORB_init (argc,
                          argv,
-                         "",
-                         ACE_TRY_ENV);
+                         ""
+                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       fudge_priorities (orb.in ());
 
       CORBA::Object_var object =
-        orb->resolve_initial_references ("RootPOA",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RootPOA"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (object.in (),
-                                      ACE_TRY_ENV);
+        PortableServer::POA::_narrow (object.in ()
+                                      TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTORB",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTORB"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::RTORB_var rt_orb =
-        RTCORBA::RTORB::_narrow (object.in (),
-                                 ACE_TRY_ENV);
+        RTCORBA::RTORB::_narrow (object.in ()
+                                 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       object =
-        orb->resolve_initial_references ("RTCurrent",
-                                         ACE_TRY_ENV);
+        orb->resolve_initial_references ("RTCurrent"
+                                         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       RTCORBA::Current_var current =
-        RTCORBA::Current::_narrow (object.in (),
-                                   ACE_TRY_ENV);
+        RTCORBA::Current::_narrow (object.in ()
+                                   TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       default_thread_priority =
-        current->the_priority (ACE_TRY_ENV);
+        current->the_priority (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       int result =
@@ -272,8 +272,8 @@ main (int argc, char *argv[])
                                              max_buffered_requests,
                                              max_request_buffer_size,
                                              allow_borrowing,
-                                             policies,
-                                             ACE_TRY_ENV);
+                                             policies
+                                             TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       else if (ACE_OS::strcmp (lanes_file, "empty-file") != 0)
@@ -289,8 +289,8 @@ main (int argc, char *argv[])
                                 max_buffered_requests,
                                 max_request_buffer_size,
                                 allow_borrowing,
-                                policies,
-                                ACE_TRY_ENV);
+                                policies
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (result != 0)
@@ -300,8 +300,8 @@ main (int argc, char *argv[])
             get_priority_bands ("server",
                                 bands_file,
                                 rt_orb.in (),
-                                policies,
-                                ACE_TRY_ENV);
+                                policies
+                                TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           if (result != 0)
@@ -320,50 +320,50 @@ main (int argc, char *argv[])
                                        pool_priority,
                                        allow_request_buffering,
                                        max_buffered_requests,
-                                       max_request_buffer_size,
-                                       ACE_TRY_ENV);
+                                       max_request_buffer_size
+                                       TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           policies.length (policies.length () + 1);
           policies[policies.length () - 1] =
-            rt_orb->create_threadpool_policy (threadpool_id,
-                                              ACE_TRY_ENV);
+            rt_orb->create_threadpool_policy (threadpool_id
+                                              TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
-	  if (ACE_OS::strcmp (bands_file, "empty-file") != 0)
-	    {
-	      result =
-		get_priority_bands ("server",
-				    bands_file,
-				    rt_orb.in (),
-				    policies,
-				    ACE_TRY_ENV);
-	      ACE_TRY_CHECK;
-	      
-	      if (result != 0)
-		return result;
-	    }
+          if (ACE_OS::strcmp (bands_file, "empty-file") != 0)
+            {
+              result =
+                get_priority_bands ("server",
+                                    bands_file,
+                                    rt_orb.in (),
+                                    policies
+                                    TAO_ENV_ARG_PARAMETER);
+              ACE_TRY_CHECK;
+
+              if (result != 0)
+                return result;
+            }
         }
 
       policies.length (policies.length () + 1);
       policies[policies.length () - 1] =
         root_poa->create_implicit_activation_policy
-        (PortableServer::IMPLICIT_ACTIVATION,
-         ACE_TRY_ENV);
+        (PortableServer::IMPLICIT_ACTIVATION
+         TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       policies.length (policies.length () + 1);
       policies[policies.length () - 1] =
         rt_orb->create_priority_model_policy (RTCORBA::CLIENT_PROPAGATED,
-                                              default_thread_priority,
-                                              ACE_TRY_ENV);
+                                              default_thread_priority
+                                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POA_var poa =
         root_poa->create_POA ("RT POA",
                               poa_manager.in (),
-                              policies,
-                              ACE_TRY_ENV);
+                              policies
+                              TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       test_i *servant =
@@ -374,26 +374,26 @@ main (int argc, char *argv[])
       ACE_UNUSED_ARG (safe_servant);
 
       test_var test =
-        servant->_this (ACE_TRY_ENV);
+        servant->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       result =
         write_ior_to_file (ior_output_file,
                            orb.in (),
-                           test.in (),
-                           ACE_TRY_ENV);
+                           test.in ()
+                           TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (result != 0)
         return result;
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
index 81bdd10b90a..64a2f05468a 100644
--- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
+++ b/TAO/performance-tests/Single_Threaded_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Single_Threaded_Latency/client.cpp b/TAO/performance-tests/Single_Threaded_Latency/client.cpp
index b89b3efb533..976dfc67a00 100644
--- a/TAO/performance-tests/Single_Threaded_Latency/client.cpp
+++ b/TAO/performance-tests/Single_Threaded_Latency/client.cpp
@@ -83,18 +83,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -108,7 +108,7 @@ main (int argc, char *argv[])
       for (int j = 0; j < 100; ++j)
         {
           ACE_hrtime_t start = 0;
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
@@ -119,7 +119,7 @@ main (int argc, char *argv[])
         {
           ACE_hrtime_t start = ACE_OS::gethrtime ();
 
-          (void) roundtrip->test_method (start, ACE_TRY_ENV);
+          (void) roundtrip->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -149,7 +149,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Single_Threaded_Latency/server.cpp b/TAO/performance-tests/Single_Threaded_Latency/server.cpp
index 641064ea327..5fb1e4454da 100644
--- a/TAO/performance-tests/Single_Threaded_Latency/server.cpp
+++ b/TAO/performance-tests/Single_Threaded_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
index 3271329b0db..ee32b19f696 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.cpp
@@ -15,17 +15,17 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -50,14 +50,14 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
       ACE_TRY
         {
-          (void) this->roundtrip_->test_method (dummy, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (dummy TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h
index 1655e0f8847..a75172e8161 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Client_Task.h
@@ -29,7 +29,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (CORBA::Environment &ACE_TRY_ENV);
+  void validate_connection (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
index 76f101734c9..eb8e866becc 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
index 896f685f99d..a38a0fe51b4 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/client.cpp
@@ -76,18 +76,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp b/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
index 912b380725a..00e272a02fa 100644
--- a/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
+++ b/TAO/performance-tests/Thread_Per_Connection_Latency/server.cpp
@@ -64,11 +64,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -77,11 +77,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -94,11 +94,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -111,18 +111,18 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
index 8f88421e8a0..97f1ef0a50b 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
+++ b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.cpp
@@ -15,17 +15,17 @@ Client_Task::Client_Task (Test::Roundtrip_ptr roundtrip,
 int
 Client_Task::svc (void)
 {
-  ACE_DECLARE_NEW_CORBA_ENV;
+  TAO_ENV_DECLARE_NEW_ENV;
   ACE_TRY
     {
-      this->validate_connection (ACE_TRY_ENV);
+      this->validate_connection (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       for (int i = 0; i != this->niterations_; ++i)
         {
           CORBA::ULongLong start = ACE_OS::gethrtime ();
 
-          (void) this->roundtrip_->test_method (start, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (start TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -50,14 +50,14 @@ Client_Task::accumulate_and_dump (ACE_Basic_Stats &totals,
 }
 
 void
-Client_Task::validate_connection (CORBA::Environment &ACE_TRY_ENV)
+Client_Task::validate_connection (TAO_ENV_SINGLE_ARG_DECL)
 {
   CORBA::ULongLong dummy = 0;
   for (int i = 0; i != 100; ++i)
     {
       ACE_TRY
         {
-          (void) this->roundtrip_->test_method (dummy, ACE_TRY_ENV);
+          (void) this->roundtrip_->test_method (dummy TAO_ENV_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
       ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h
index 1655e0f8847..a75172e8161 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h
+++ b/TAO/performance-tests/Thread_Pool_Latency/Client_Task.h
@@ -29,7 +29,7 @@ public:
 
 private:
   /// Make sure that the current thread has a connection available.
-  void validate_connection (CORBA::Environment &ACE_TRY_ENV);
+  void validate_connection (TAO_ENV_SINGLE_ARG_DECL);
 
 private:
   /// The object reference used for this test
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
index 01a2dce839d..0337e54c34f 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
+++ b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.cpp
@@ -11,16 +11,16 @@ Roundtrip::Roundtrip (CORBA::ORB_ptr orb)
 }
 
 Test::Timestamp
-Roundtrip::test_method (Test::Timestamp send_time,
-                        CORBA::Environment &)
+Roundtrip::test_method (Test::Timestamp send_time
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   return send_time;
 }
 
 void
-Roundtrip::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Roundtrip::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
index 5cc06d55013..5c264f18e1f 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
+++ b/TAO/performance-tests/Thread_Pool_Latency/Roundtrip.h
@@ -25,11 +25,11 @@ public:
   Roundtrip (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Timestamp test_method (Test::Timestamp send_time,
-                                       CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Timestamp test_method (Test::Timestamp send_time
+                                       TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp
index bcd94b6d1f7..50a9ba7e898 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp
+++ b/TAO/performance-tests/Thread_Pool_Latency/Worker_Thread.cpp
@@ -16,7 +16,7 @@ Worker_Thread::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 {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Thread_Pool_Latency/client.cpp b/TAO/performance-tests/Thread_Pool_Latency/client.cpp
index a522c394b8c..f3ef1a10bd1 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/client.cpp
+++ b/TAO/performance-tests/Thread_Pool_Latency/client.cpp
@@ -76,18 +76,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var object =
-        orb->string_to_object (ior, ACE_TRY_ENV);
+        orb->string_to_object (ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Roundtrip_var roundtrip =
-        Test::Roundtrip::_narrow (object.in (), ACE_TRY_ENV);
+        Test::Roundtrip::_narrow (object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (roundtrip.in ()))
@@ -134,7 +134,7 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          roundtrip->shutdown (ACE_TRY_ENV);
+          roundtrip->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
     }
diff --git a/TAO/performance-tests/Thread_Pool_Latency/server.cpp b/TAO/performance-tests/Thread_Pool_Latency/server.cpp
index 503d226a4c7..7090cfdf18e 100644
--- a/TAO/performance-tests/Thread_Pool_Latency/server.cpp
+++ b/TAO/performance-tests/Thread_Pool_Latency/server.cpp
@@ -65,11 +65,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -78,11 +78,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -95,11 +95,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var owner_transfer(roundtrip_impl);
 
       Test::Roundtrip_var roundtrip =
-        roundtrip_impl->_this (ACE_TRY_ENV);
+        roundtrip_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-        orb->object_to_string (roundtrip.in (), ACE_TRY_ENV);
+        orb->object_to_string (roundtrip.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -112,7 +112,7 @@ main (int argc, char *argv[])
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Worker_Thread worker (orb.in ());
@@ -122,10 +122,10 @@ main (int argc, char *argv[])
 
       ACE_DEBUG ((LM_DEBUG, "(%P|%t) server - event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Throughput/Receiver.cpp b/TAO/performance-tests/Throughput/Receiver.cpp
index da9f6df9b71..05b0fe9a001 100644
--- a/TAO/performance-tests/Throughput/Receiver.cpp
+++ b/TAO/performance-tests/Throughput/Receiver.cpp
@@ -17,8 +17,8 @@ Receiver::Receiver (void)
 }
 
 void
-Receiver::receive_data (const Test::Message &the_message,
-                        CORBA::Environment &)
+Receiver::receive_data (const Test::Message &the_message
+                        TAO_ENV_ARG_DECL_NOT_USED)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   ACE_hrtime_t now = ACE_OS::gethrtime ();
@@ -45,7 +45,7 @@ Receiver::receive_data (const Test::Message &the_message,
 }
 
 void
-Receiver::done (CORBA::Environment &ACE_TRY_ENV)
+Receiver::done (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   if (this->message_count_ == 0)
@@ -87,12 +87,12 @@ Receiver::done (CORBA::Environment &ACE_TRY_ENV)
 
   ACE_TRY
     {
-      PortableServer::POA_var poa = this->_default_POA (ACE_TRY_ENV);
+      PortableServer::POA_var poa = this->_default_POA (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
       PortableServer::ObjectId_var oid =
-        poa->servant_to_id (this, ACE_TRY_ENV);
+        poa->servant_to_id (this TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
-      poa->deactivate_object (oid.in (), ACE_TRY_ENV);
+      poa->deactivate_object (oid.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY {} ACE_ENDTRY;
diff --git a/TAO/performance-tests/Throughput/Receiver.h b/TAO/performance-tests/Throughput/Receiver.h
index d3f74c51d74..ab15144cacb 100644
--- a/TAO/performance-tests/Throughput/Receiver.h
+++ b/TAO/performance-tests/Throughput/Receiver.h
@@ -25,11 +25,11 @@ public:
   Receiver (void);
 
   // = The skeleton methods
-  virtual void receive_data (const Test::Message &message,
-                             CORBA::Environment &ACE_TRY_ENV)
+  virtual void receive_data (const Test::Message &message
+                             TAO_ENV_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void done (CORBA::Environment &ACE_TRY_ENV)
+  virtual void done (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.cpp b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
index 680c542f853..059a7d3bd6b 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.cpp
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.cpp
@@ -12,7 +12,7 @@ Receiver_Factory::Receiver_Factory (CORBA::ORB_ptr orb)
 }
 
 Test::Receiver_ptr
-Receiver_Factory::create_receiver (CORBA::Environment &ACE_TRY_ENV)
+Receiver_Factory::create_receiver (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
   Receiver *receiver_impl;
@@ -22,12 +22,12 @@ Receiver_Factory::create_receiver (CORBA::Environment &ACE_TRY_ENV)
   ACE_CHECK_RETURN (Test::Receiver::_nil ());
   PortableServer::ServantBase_var transfer_ownership(receiver_impl);
 
-  return receiver_impl->_this (ACE_TRY_ENV);
+  return receiver_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
 }
 
 void
-Receiver_Factory::shutdown (CORBA::Environment &ACE_TRY_ENV)
+Receiver_Factory::shutdown (TAO_ENV_SINGLE_ARG_DECL)
   ACE_THROW_SPEC ((CORBA::SystemException))
 {
-  this->orb_->shutdown (0, ACE_TRY_ENV);
+  this->orb_->shutdown (0 TAO_ENV_ARG_PARAMETER);
 }
diff --git a/TAO/performance-tests/Throughput/Receiver_Factory.h b/TAO/performance-tests/Throughput/Receiver_Factory.h
index 6d37f71e9fe..0b557ad4f09 100644
--- a/TAO/performance-tests/Throughput/Receiver_Factory.h
+++ b/TAO/performance-tests/Throughput/Receiver_Factory.h
@@ -25,10 +25,10 @@ public:
   Receiver_Factory (CORBA::ORB_ptr orb);
 
   // = The skeleton methods
-  virtual Test::Receiver_ptr create_receiver (CORBA::Environment &ACE_TRY_ENV)
+  virtual Test::Receiver_ptr create_receiver (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
-  virtual void shutdown (CORBA::Environment &ACE_TRY_ENV)
+  virtual void shutdown (TAO_ENV_SINGLE_ARG_DECL)
     ACE_THROW_SPEC ((CORBA::SystemException));
 
 private:
diff --git a/TAO/performance-tests/Throughput/client.cpp b/TAO/performance-tests/Throughput/client.cpp
index 02590168ec6..847d371f043 100644
--- a/TAO/performance-tests/Throughput/client.cpp
+++ b/TAO/performance-tests/Throughput/client.cpp
@@ -23,20 +23,20 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'k':
-	ior = get_opts.optarg;
-	break;
+        ior = get_opts.optarg;
+        break;
 
       case 'b':
-	message_size = ACE_OS::atoi (get_opts.optarg);
-	break;
+        message_size = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'i':
-	message_count = ACE_OS::atoi (get_opts.optarg);
-	break;
+        message_count = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'n':
-	test_runs = ACE_OS::atoi (get_opts.optarg);
-	break;
+        test_runs = ACE_OS::atoi (get_opts.optarg);
+        break;
 
       case 'x':
         do_shutdown = 1;
@@ -46,10 +46,10 @@ parse_args (int argc, char *argv[])
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-k <ior> "
-			   "-b <message_size> "
-			   "-i <message_count> "
-			   "-n <test_repetitions> "
+                           "-k <ior> "
+                           "-b <message_size> "
+                           "-i <message_count> "
+                           "-n <test_repetitions> "
                            "\n",
                            argv [0]),
                           -1);
@@ -64,18 +64,18 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
         return 1;
 
       CORBA::Object_var tmp =
-        orb->string_to_object(ior, ACE_TRY_ENV);
+        orb->string_to_object(ior TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       Test::Receiver_Factory_var receiver_factory =
-        Test::Receiver_Factory::_narrow(tmp.in (), ACE_TRY_ENV);
+        Test::Receiver_Factory::_narrow(tmp.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (receiver_factory.in ()))
@@ -100,18 +100,18 @@ main (int argc, char *argv[])
           message.the_payload.length (message_size);
 
           Test::Receiver_var receiver =
-            receiver_factory->create_receiver (ACE_TRY_ENV);
+            receiver_factory->create_receiver (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
 
           ACE_hrtime_t start = ACE_OS::gethrtime ();
           for (int i = 0; i != message_count; ++i)
             {
               message.message_id = i;
-              receiver->receive_data (message, ACE_TRY_ENV);
+              receiver->receive_data (message TAO_ENV_ARG_PARAMETER);
               ACE_TRY_CHECK;
             }
 
-          receiver->done (ACE_TRY_ENV);
+          receiver->done (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
           ACE_hrtime_t elapsed_time = ACE_OS::gethrtime () - start;
 
@@ -140,11 +140,11 @@ main (int argc, char *argv[])
 
       if (do_shutdown)
         {
-          receiver_factory->shutdown (ACE_TRY_ENV);
+          receiver_factory->shutdown (TAO_ENV_SINGLE_ARG_PARAMETER);
           ACE_TRY_CHECK;
         }
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY
diff --git a/TAO/performance-tests/Throughput/server.cpp b/TAO/performance-tests/Throughput/server.cpp
index 24df94eba30..d0cf1854377 100644
--- a/TAO/performance-tests/Throughput/server.cpp
+++ b/TAO/performance-tests/Throughput/server.cpp
@@ -18,13 +18,13 @@ parse_args (int argc, char *argv[])
     switch (c)
       {
       case 'o':
-	ior_output_file = get_opts.optarg;
-	break;
+        ior_output_file = get_opts.optarg;
+        break;
       case '?':
       default:
         ACE_ERROR_RETURN ((LM_ERROR,
                            "usage:  %s "
-			   "-o <iorfile>"
+                           "-o <iorfile>"
                            "\n",
                            argv [0]),
                           -1);
@@ -39,11 +39,11 @@ main (int argc, char *argv[])
   ACE_TRY_NEW_ENV
     {
       CORBA::ORB_var orb =
-        CORBA::ORB_init (argc, argv, "", ACE_TRY_ENV);
+        CORBA::ORB_init (argc, argv, "" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::Object_var poa_object =
-        orb->resolve_initial_references("RootPOA", ACE_TRY_ENV);
+        orb->resolve_initial_references("RootPOA" TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (CORBA::is_nil (poa_object.in ()))
@@ -52,11 +52,11 @@ main (int argc, char *argv[])
                           1);
 
       PortableServer::POA_var root_poa =
-        PortableServer::POA::_narrow (poa_object.in (), ACE_TRY_ENV);
+        PortableServer::POA::_narrow (poa_object.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       PortableServer::POAManager_var poa_manager =
-        root_poa->the_POAManager (ACE_TRY_ENV);
+        root_poa->the_POAManager (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       if (parse_args (argc, argv) != 0)
@@ -69,11 +69,11 @@ main (int argc, char *argv[])
       PortableServer::ServantBase_var receiver_factory_owner_transfer(receiver_factory_impl);
 
       Test::Receiver_Factory_var receiver_factory =
-        receiver_factory_impl->_this (ACE_TRY_ENV);
+        receiver_factory_impl->_this (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       CORBA::String_var ior =
-	orb->object_to_string (receiver_factory.in (), ACE_TRY_ENV);
+        orb->object_to_string (receiver_factory.in () TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       // If the ior_output_file exists, output the ior to it
@@ -82,22 +82,22 @@ main (int argc, char *argv[])
         ACE_ERROR_RETURN ((LM_ERROR,
                            "Cannot open output file for writing IOR: %s",
                            ior_output_file),
-			      1);
+                              1);
       ACE_OS::fprintf (output_file, "%s", ior.in ());
       ACE_OS::fclose (output_file);
 
-      poa_manager->activate (ACE_TRY_ENV);
+      poa_manager->activate (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->run (ACE_TRY_ENV);
+      orb->run (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
       ACE_DEBUG ((LM_DEBUG, "Server event loop finished\n"));
 
-      root_poa->destroy (1, 1, ACE_TRY_ENV);
+      root_poa->destroy (1, 1 TAO_ENV_ARG_PARAMETER);
       ACE_TRY_CHECK;
 
-      orb->destroy (ACE_TRY_ENV);
+      orb->destroy (TAO_ENV_SINGLE_ARG_PARAMETER);
       ACE_TRY_CHECK;
     }
   ACE_CATCHANY